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 2021/10/28 09:27:50 UTC
[jspwiki] branch master updated: JSPWIKI-1157 - Remove redundant
String
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 ae435be JSPWIKI-1157 - Remove redundant String
ae435be is described below
commit ae435beec10d8fbe1934a10638e8ed34d154b0d6
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Sat Oct 2 10:31:27 2021 +0200
JSPWIKI-1157 - Remove redundant String
---
jspwiki-main/src/main/java/org/apache/wiki/TranslationsCheck.java | 6 +++---
.../src/main/java/org/apache/wiki/content/DefaultPageRenamer.java | 6 +++---
.../java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java | 8 ++++----
.../src/main/java/org/apache/wiki/parser/JSPWikiMarkupParser.java | 2 +-
.../src/main/java/org/apache/wiki/plugin/WeblogPlugin.java | 2 +-
jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java | 6 +++---
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/TranslationsCheck.java b/jspwiki-main/src/main/java/org/apache/wiki/TranslationsCheck.java
index b04cbda..4a764e9 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/TranslationsCheck.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/TranslationsCheck.java
@@ -126,7 +126,7 @@ public class TranslationsCheck {
System.out.println( iter.next() );
}
}
- System.out.println( "" );
+ System.out.println( );
return metrics;
}
@@ -157,7 +157,7 @@ public class TranslationsCheck {
}
}
if( missing > 0 ) {
- System.out.println( "" );
+ System.out.println();
}
iter = sortedNames( p2 ).iterator();
@@ -175,7 +175,7 @@ public class TranslationsCheck {
}
}
if( outdated > 0 ) {
- System.out.println( "" );
+ System.out.println();
}
final Map< String, Integer > diff = new HashMap<>( 2 );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/content/DefaultPageRenamer.java b/jspwiki-main/src/main/java/org/apache/wiki/content/DefaultPageRenamer.java
index b1bb8c6..022b14d 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/content/DefaultPageRenamer.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/content/DefaultPageRenamer.java
@@ -234,7 +234,7 @@ public class DefaultPageRenamer implements PageRenamer {
while( matcher.find( start ) ) {
final String match = matcher.group();
- sb.append( sourceText.substring( start, matcher.start() ) );
+ sb.append( sourceText, start, matcher.start() );
final int lastOpenBrace = sourceText.lastIndexOf( '[', matcher.start() );
final int lastCloseBrace = sourceText.lastIndexOf( ']', matcher.start() );
@@ -270,7 +270,7 @@ public class DefaultPageRenamer implements PageRenamer {
if( !matcher.group(1).isEmpty() || charBefore == '~' || charBefore == '[' ) {
// Found an escape character, so I am escaping.
- sb.append( sourceText.substring( start, matcher.end() ) );
+ sb.append( sourceText, start, matcher.end() );
start = matcher.end();
continue;
}
@@ -291,7 +291,7 @@ public class DefaultPageRenamer implements PageRenamer {
//
// Construct the new string
//
- sb.append( sourceText.substring( start, matcher.start() ) );
+ sb.append( sourceText, start, matcher.start() );
sb.append( "[" ).append( text );
if( !link.isEmpty() ) {
sb.append( "|" ).append( link );
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java b/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
index 2626e6f..f314ca7 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/parser/CreoleToJSPWikiTranslator.java
@@ -290,7 +290,7 @@ public class CreoleToJSPWikiTranslator
&& (actSourceSymbol.equals("") || line.substring(0, 1).equals(actSourceSymbol)))
{
actSourceSymbol = line.substring(0, 1);
- line = line.substring(1, line.length());
+ line = line.substring( 1 );
counter++;
}
if ((inList == -1 && counter != 1) || (inList != -1 && inList + 1 < counter))
@@ -358,7 +358,7 @@ public class CreoleToJSPWikiTranslator
final String protectedMarkup = c_protectionMap.get(hash);
content = content.replace(hash, protectedMarkup);
if ((protectedMarkup.length() < 3 || (protectedMarkup.length() > 2 &&
- !protectedMarkup.substring(0, 3).equals("{{{")))&&replacePlugins)
+ !protectedMarkup.startsWith("{{{")))&&replacePlugins)
content = translateElement(content, CREOLE_PLUGIN, JSPWIKI_PLUGIN);
}
@@ -475,7 +475,7 @@ public class CreoleToJSPWikiTranslator
final int pos = contentCopy.indexOf(temp);
contentCopy = contentCopy.substring(0, pos) + protectedMarkup
- + contentCopy.substring(pos + temp.length(), contentCopy.length());
+ + contentCopy.substring(pos + temp.length());
}
return contentCopy;
}
@@ -492,7 +492,7 @@ public class CreoleToJSPWikiTranslator
protectedMarkup = protectedMarkup.replaceAll(replaceSource, replaceTarget);
final int pos = contentCopy.indexOf(temp);
contentCopy = contentCopy.substring(0, pos) + protectedMarkup
- + contentCopy.substring(pos + temp.length(), contentCopy.length());
+ + contentCopy.substring(pos + temp.length() );
}
return contentCopy;
}
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 3c8e6fc..e4c9b4d 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
@@ -1602,7 +1602,7 @@ public class JSPWikiMarkupParser extends MarkupParser {
{
// Substitute all but the last character (keep the expressed bullet preference)
strBullets = (numBullets > 1 ? m_genlistBulletBuffer.substring(0, numBullets-1) : "")
- + strBullets.substring(numBullets-1, numBullets);
+ + strBullets.charAt( numBullets-1 );
}
else
{
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
index 8311b1a..fe6ba1a 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/WeblogPlugin.java
@@ -325,7 +325,7 @@ public class WeblogPlugin implements Plugin, ParserStagePlugin {
}
cutoff++;
}
- buffer.append(html.substring(0, cutoff));
+ buffer.append( html, 0, cutoff );
if (hasBeenCutOff) {
buffer.append( " <a href=\"" ).append( entryCtx.getURL( ContextEnum.PAGE_VIEW.getRequestContext(), entry.getName() ) ).append( "\">" ).append( rb.getString( "weblogentryplugin.more" ) ).append( "</a>\n" );
}
diff --git a/jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java b/jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java
index d7bd856..efabc9b 100644
--- a/jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java
+++ b/jspwiki-util/src/main/java/org/apache/wiki/util/TextUtil.java
@@ -241,7 +241,7 @@ public final class TextUtil {
int last = 0;
while ( ( start = orig.indexOf( src,end ) ) != -1 ) {
- res.append( orig.substring( last, start ) );
+ res.append( orig, last, start );
res.append( dest );
end = start + src.length();
last = start + src.length();
@@ -291,7 +291,7 @@ public final class TextUtil {
final String origCaseUnsn = orig.toLowerCase();
final String srcCaseUnsn = src.toLowerCase();
while( ( start = origCaseUnsn.indexOf( srcCaseUnsn, end ) ) != -1 ) {
- res.append( orig.substring( last, start ) );
+ res.append( orig, last, start );
res.append( dest );
end = start + src.length();
last = start + src.length();
@@ -829,7 +829,7 @@ public final class TextUtil {
final StringBuilder pw = new StringBuilder();
for( int i = 0; i < PASSWORD_LENGTH; i++ ) {
final int index = ( int )( RANDOM.nextDouble() * PWD_BASE.length() );
- pw.append(PWD_BASE.substring(index, index + 1));
+ pw.append(PWD_BASE.charAt( index ));
}
return pw.toString();
}