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
The following commit(s) were added to refs/heads/master by this push:
new 9c02f37 JSPWIKI-1153 - Inline Variable
9c02f37 is described below
commit 9c02f3784174e1d666ddb010d206be27e6ef0aea
Author: Arturo Bernal <[email protected]>
AuthorDate: Fri Sep 24 06:42:30 2021 +0200
JSPWIKI-1153 - Inline Variable
---
.../java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java | 6 ++----
.../src/main/java/org/apache/wiki/modules/BaseModuleManager.java | 4 ++--
.../src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java | 3 +--
.../main/java/org/apache/wiki/providers/VersioningFileProvider.java | 3 +--
.../src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java | 5 ++---
.../src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java | 5 ++---
jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockInfo.java | 5 ++---
.../src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java | 5 ++---
.../src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java | 5 ++---
.../main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java | 5 ++---
.../src/main/java/org/apache/wiki/ui/DefaultTemplateManager.java | 5 ++---
11 files changed, 20 insertions(+), 31 deletions(-)
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java
b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java
index fa026d9..a2c17a3 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/htmltowiki/HtmlStringToWikiTranslator.java
@@ -91,8 +91,7 @@ public class HtmlStringToWikiTranslator
{
final Element element = htmlStringToElement( html );
final XHtmlElementToWikiTranslator xhtmlTranslator = new
XHtmlElementToWikiTranslator( element, config );
- final String wikiMarkup = xhtmlTranslator.getWikiString();
- return wikiMarkup;
+ return xhtmlTranslator.getWikiString();
}
/**
@@ -107,8 +106,7 @@ public class HtmlStringToWikiTranslator
{
final SAXBuilder builder = new SAXBuilder( new XMLReaderSAX2Factory(
true, CYBERNEKO_PARSER), null, null );
final Document doc = builder.build( new StringReader( html ) );
- final Element element = doc.getRootElement();
- return element;
+ return doc.getRootElement();
}
/**
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/modules/BaseModuleManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/modules/BaseModuleManager.java
index fda2683..67aa9d5 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/modules/BaseModuleManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/modules/BaseModuleManager.java
@@ -65,8 +65,8 @@ public abstract class BaseModuleManager implements
ModuleManager {
protected < T extends WikiModuleInfo > Collection< WikiModuleInfo >
modules( final Iterator< T > iterator ) {
final Set< WikiModuleInfo > ls = new TreeSet<>();
- for( final Iterator< T > i = iterator; i.hasNext(); ) {
- final WikiModuleInfo wmi = i.next();
+ for( ; iterator.hasNext(); ) {
+ final WikiModuleInfo wmi = iterator.next();
ls.add( wmi );
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java
b/jspwiki-main/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java
index e6ee24a..f9349ad 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/SampleAjaxPlugin.java
@@ -40,9 +40,8 @@ public class SampleAjaxPlugin implements Plugin,
WikiAjaxServlet {
@Override
public String execute( final Context context, final Map<String, String>
params) throws PluginException {
final String id = Integer.toString(this.hashCode());
- final String html= "<div
onclick='Wiki.ajaxHtmlCall(\"/"+SERVLET_MAPPING+"/ajaxAction\",[12,45],\"result"+id+"\",\"Loading...\")'
style='color: blue; cursor: pointer'>Press Me</div>\n"+
+ return "<div
onclick='Wiki.ajaxHtmlCall(\"/"+SERVLET_MAPPING+"/ajaxAction\",[12,45],\"result"+id+"\",\"Loading...\")'
style='color: blue; cursor: pointer'>Press Me</div>\n"+
"<div id='result"+id+"'></div>";
- return html;
}
@Override
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
b/jspwiki-main/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
index db9e757..93039dd 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/providers/VersioningFileProvider.java
@@ -239,8 +239,7 @@ public class VersioningFileProvider extends
AbstractFileProvider {
// The profiler showed the probability was very high that when
calling for the history of
// a page the propertyfile would be read as much times as there were
versions of that file.
// It is statistically likely the propertyfile will be examined many
times before it is updated.
- final CachedProperties cp = new CachedProperties( page, properties,
propertyFile.lastModified() );
- m_cachedProperties = cp; // Atomic
+ m_cachedProperties = new CachedProperties( page, properties,
propertyFile.lastModified() ); // Atomic
}
/**
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java
index 3767286..ecd3490 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/AdminBeanIteratorInfo.java
@@ -35,14 +35,13 @@ public class AdminBeanIteratorInfo extends TagExtraInfo
@Override
public VariableInfo[] getVariableInfo(final TagData data)
{
- final VariableInfo[] var = { new VariableInfo(
data.getAttributeString("id"),
+
+ return new VariableInfo[]{ new VariableInfo(
data.getAttributeString("id"),
"org.apache.wiki.ui.admin.AdminBean",
true,
VariableInfo.NESTED )
};
- return var;
-
}
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java
index 415df69..c7b5110 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorInfo.java
@@ -35,13 +35,12 @@ public class AttachmentsIteratorInfo extends TagExtraInfo
@Override
public VariableInfo[] getVariableInfo( final TagData data)
{
- final VariableInfo[] var = { new VariableInfo(
data.getAttributeString("id"),
+
+ return new VariableInfo[]{ new VariableInfo(
data.getAttributeString("id"),
"org.apache.wiki.api.core.Attachment",
true,
VariableInfo.NESTED )
};
- return var;
-
}
}
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockInfo.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockInfo.java
index d49468d..a3d00ce 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockInfo.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/CheckLockInfo.java
@@ -32,13 +32,12 @@ public class CheckLockInfo extends TagExtraInfo {
*/
@Override
public VariableInfo[] getVariableInfo(final TagData data) {
- final VariableInfo[] var = { new VariableInfo(
data.getAttributeString( "id" ),
+
+ return new VariableInfo[]{ new VariableInfo( data.getAttributeString(
"id" ),
"org.apache.wiki.pages.PageLock",
true,
VariableInfo.NESTED )
};
-
- return var;
}
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java
index 1096c4e..ba06852 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/EditorIteratorInfo.java
@@ -31,13 +31,12 @@ public class EditorIteratorInfo extends TagExtraInfo
{
public VariableInfo[] getVariableInfo(final TagData data)
{
- final VariableInfo[] var = { new VariableInfo(
data.getAttributeString("id"),
+
+ return new VariableInfo[]{ new VariableInfo(
data.getAttributeString("id"),
"org.apache.wiki.ui.Editor",
true,
VariableInfo.NESTED )
};
-
- return var;
}
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java
index e754f7d..1afa6ca 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorInfo.java
@@ -31,13 +31,12 @@ public class HistoryIteratorInfo extends TagExtraInfo
{
public VariableInfo[] getVariableInfo( final TagData data)
{
- final VariableInfo[] var = { new VariableInfo(
data.getAttributeString("id"),
+
+ return new VariableInfo[]{ new VariableInfo(
data.getAttributeString("id"),
"org.apache.wiki.api.core.Page",
true,
VariableInfo.NESTED )
};
- return var;
-
}
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java
b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java
index 143f5e5..fbdfe33 100644
---
a/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java
+++
b/jspwiki-main/src/main/java/org/apache/wiki/tags/SearchResultIteratorInfo.java
@@ -31,13 +31,12 @@ import javax.servlet.jsp.tagext.VariableInfo;
public class SearchResultIteratorInfo extends TagExtraInfo {
public VariableInfo[] getVariableInfo( final TagData data ) {
- final VariableInfo[] var = { new VariableInfo(
data.getAttributeString( "id" ),
+
+ return new VariableInfo[]{ new VariableInfo( data.getAttributeString(
"id" ),
"org.apache.wiki.api.search.SearchResult",
true,
VariableInfo.NESTED )
};
-
- return var;
}
}
diff --git
a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultTemplateManager.java
b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultTemplateManager.java
index 905f36f..53d817e 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultTemplateManager.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/ui/DefaultTemplateManager.java
@@ -300,9 +300,8 @@ public class DefaultTemplateManager extends
BaseModuleManager implements Templat
for( final String s : tfArr ) {
try {
- final String f = s;
- fmt.applyPattern( f );
- resultMap.put( f, fmt.format( d ) );
+ fmt.applyPattern( s );
+ resultMap.put( s, fmt.format( d ) );
} catch( final IllegalArgumentException e ) {
} // skip parameter
}
