mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-10-29 19:57:28 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-2204: Code cleanup: Remove redundant final modifier from private and static methods

Browse Source
This commit is contained in:
arthur 2020-11-16 22:48:52 +03:00
parent ff255e458e
commit 75682fec07
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/FpRes.java
View File

@ -37,7 +37,7 @@ public class FpRes {
prb = (PropertyResourceBundle)ResourceBundle.getBundle("i18n/fastpath_i18n");
}
public static final String getString(String propertyName) {
public static String getString(String propertyName) {
try {
/* Revert to this code after Spark is moved to Java 11 or newer
return prb.getString(propertyName);
@ -51,7 +51,7 @@ public class FpRes {
}
public static final String getString(String propertyName, Object... obj) {
public static String getString(String propertyName, Object... obj) {
String str = prb.getString(propertyName);
if (str == null) {
return null;

6
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/internal/FormUtils.java
View File

@ -37,7 +37,7 @@ final public class FormUtils {
* @param str - the string to check.
* @return true if String has been assigned a value, false otherwise.
*/
final public static boolean isNotNull(String str) {
public static boolean isNotNull(String str) {
return str != null && str.trim().length() > 0;
}
@ -49,7 +49,7 @@ final public class FormUtils {
* @return true if the string is not null and the value is equal to true, false
* otherwise.
*/
final public static boolean isTrue(String str) {
public static boolean isTrue(String str) {
return (str != null && str.equalsIgnoreCase("true"));
}
@ -80,7 +80,7 @@ final public class FormUtils {
* @param newString the String that will replace all instances of oldString
* @return a String will all instances of oldString replaced by newString
*/
public static final String replace(String string, String oldString, String newString) {
public static String replace(String string, String oldString, String newString) {
if (string == null) {
return null;
}

6
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/resources/FastpathRes.java
View File

@ -258,11 +258,11 @@ public class FastpathRes {
prb = (PropertyResourceBundle)ResourceBundle.getBundle("fastpath");
}
public static final String getString(String propertyName) {
public static String getString(String propertyName) {
return prb.getString(propertyName);
}
public static final ImageIcon getImageIcon(String imageName) {
public static ImageIcon getImageIcon(String imageName) {
try {
final String iconURI = getString(imageName);
final URL imageURL = cl.getResource(iconURI);
@ -274,7 +274,7 @@ public class FastpathRes {
return null;
}
public static final URL getURL(String propertyName) {
public static URL getURL(String propertyName) {
return cl.getResource(getString(propertyName));
}

2
plugins/fastpath/src/main/java/org/jivesoftware/fastpath/workspace/assistants/Notes.java
View File

@ -216,7 +216,7 @@ public class Notes extends JPanel {
* @param newString the String that will replace all instances of oldString
* @return a String will all instances of oldString replaced by newString
*/
public static final String replace(String string, String oldString, String newString) {
public static String replace(String string, String oldString, String newString) {
if (string == null) {
return null;
}

2
plugins/flashing/src/main/java/org/jivesoftware/spark/plugin/flashing/FlashingResources.java
View File

@ -30,7 +30,7 @@ public class FlashingResources {
prb = (PropertyResourceBundle)ResourceBundle.getBundle("i18n/flashing_i18n");
}
public static final String getString(String propertyName) {
public static String getString(String propertyName) {
try {
/* Revert to this code after Spark is moved to Java 11 or newer
return prb.getString(propertyName);

2
plugins/meet/src/main/java/de/mxro/process/internal/StreamReader.java
View File

@ -52,7 +52,7 @@ public class StreamReader {
/**
* Wait longer and longer to not keep CPU busy.
*/
private final void waitForInput() {
private void waitForInput() {
try {
Thread.sleep(this.timeout);
} catch (final InterruptedException e) {

6
plugins/reversi/src/main/java/org/jivesoftware/game/reversi/ReversiRes.java
View File

@ -30,11 +30,11 @@ public class ReversiRes {
ReversiRes.prb = (PropertyResourceBundle) ResourceBundle.getBundle("reversi");
}
public static final String getString(String propertyName) {
public static String getString(String propertyName) {
return ReversiRes.prb.getString(propertyName);
}
public static final ImageIcon getImageIcon(String imageName) {
public static ImageIcon getImageIcon(String imageName) {
try {
final String iconURI = ReversiRes.getString(imageName);
final URL imageURL = ReversiRes.cl.getResource(iconURI);
@ -46,7 +46,7 @@ public class ReversiRes {
return null;
}
public static final URL getURL(String propertyName) {
public static URL getURL(String propertyName) {
return ReversiRes.cl.getResource(ReversiRes.getString(propertyName));
}

2
plugins/roar/src/main/java/org/jivesoftware/spark/roar/RoarResources.java
View File

@ -16,7 +16,7 @@ public class RoarResources {
prb = (PropertyResourceBundle) ResourceBundle.getBundle("i18n/roar_i18n");
}
public static final String getString(String propertyName) {
public static String getString(String propertyName) {
try {
/* Revert to this code after Spark is moved to Java 11 or newer
return prb.getString(propertyName);

2
plugins/tictactoe/src/main/java/tic/tac/toe/TTTRes.java
View File

@ -38,7 +38,7 @@ public class TTTRes {
.getBundle("i18n/tictactoe_i18n");
}
public static final String getString(String propertyName) {
public static String getString(String propertyName) {
try {
return prb.getString(propertyName);
} catch (Exception e) {

2
plugins/transferguard/src/main/java/org/jivesoftware/spark/plugins/transfersettings/TGuardRes.java
View File

@ -24,7 +24,7 @@ public class TGuardRes {
.getBundle("i18n/transferguard_i18n");
}
public static final String getString(String propertyName) {
public static String getString(String propertyName) {
try {
/* Revert to this code after Spark is moved to Java 11 or newer
return prb.getString(propertyName);