This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-scxml.git
The following commit(s) were added to refs/heads/master by this push:
new 9b2e088 Use isEmpty().
9b2e088 is described below
commit 9b2e08816a9fdf19be6f5f1b470d589332f45221
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Jan 17 10:32:58 2021 -0500
Use isEmpty().
---
.../scxml2/env/groovy/GroovyExtendableScriptCache.java | 2 +-
.../org/apache/commons/scxml2/io/ContentParser.java | 2 +-
.../java/org/apache/commons/scxml2/io/SCXMLReader.java | 2 +-
.../java/org/apache/commons/scxml2/io/SCXMLWriter.java | 4 ++--
.../java/org/apache/commons/scxml2/model/Send.java | 4 ++--
.../org/apache/commons/scxml2/model/Transition.java | 18 ++++++++----------
6 files changed, 15 insertions(+), 17 deletions(-)
diff --git
a/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyExtendableScriptCache.java
b/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyExtendableScriptCache.java
index 5418774..36ccc17 100644
---
a/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyExtendableScriptCache.java
+++
b/src/main/java/org/apache/commons/scxml2/env/groovy/GroovyExtendableScriptCache.java
@@ -283,7 +283,7 @@ public class GroovyExtendableScriptCache implements
Serializable {
*/
@SuppressWarnings("unused")
public void setScriptCodeBase(final String scriptCodeBase) {
- if (scriptCodeBase != null && scriptCodeBase.length() > 0 &&
scriptCodeBase.charAt(0) == '/') {
+ if (scriptCodeBase != null && !scriptCodeBase.isEmpty() &&
scriptCodeBase.charAt(0) == '/') {
this.scriptCodeBase = scriptCodeBase;
}
else {
diff --git a/src/main/java/org/apache/commons/scxml2/io/ContentParser.java
b/src/main/java/org/apache/commons/scxml2/io/ContentParser.java
index 2d326ee..0c6c766 100644
--- a/src/main/java/org/apache/commons/scxml2/io/ContentParser.java
+++ b/src/main/java/org/apache/commons/scxml2/io/ContentParser.java
@@ -143,7 +143,7 @@ public class ContentParser {
* @return true if content start with '{' or '[' character
*/
public static boolean hasJsonSignature(final String content) {
- final char c = content.length() > 0 ? content.charAt(0) : 0;
+ final char c = !content.isEmpty() ? content.charAt(0) : 0;
return c == '{' || c == '[';
}
diff --git a/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
b/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
index 63529d9..19432e8 100644
--- a/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
+++ b/src/main/java/org/apache/commons/scxml2/io/SCXMLReader.java
@@ -2254,7 +2254,7 @@ public final class SCXMLReader {
* @return a qualified name from a prefix and localName
*/
private static String createQualifiedName(final String prefix, final
String localName) {
- return (prefix != null && prefix.length() > 0 ? prefix + ":" : "")
+localName;
+ return (prefix != null && !prefix.isEmpty() ? prefix + ":" : "") +
localName;
}
/**
diff --git a/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java
b/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java
index 08f5b9e..19757e1 100644
--- a/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java
+++ b/src/main/java/org/apache/commons/scxml2/io/SCXMLWriter.java
@@ -421,7 +421,7 @@ public class SCXMLWriter {
if (scxml.getNamespaces() != null) {
for (final Map.Entry<String, String> entry :
scxml.getNamespaces().entrySet()) {
final String key = entry.getKey();
- if (key != null && key.trim().length() > 0) {
+ if (key != null && !key.trim().isEmpty()) {
writer.writeNamespace(key, entry.getValue());
}
}
@@ -1093,7 +1093,7 @@ public class SCXMLWriter {
* @return a qualified name from a prefix and localName
*/
private static String createQualifiedName(final String prefix, final
String localName) {
- return (prefix != null && prefix.length() > 0 ? prefix + ":" : "")
+localName;
+ return (prefix != null && !prefix.isEmpty() ? prefix + ":" : "") +
localName;
}
/**
diff --git a/src/main/java/org/apache/commons/scxml2/model/Send.java
b/src/main/java/org/apache/commons/scxml2/model/Send.java
index acc39a1..ca99518 100644
--- a/src/main/java/org/apache/commons/scxml2/model/Send.java
+++ b/src/main/java/org/apache/commons/scxml2/model/Send.java
@@ -494,7 +494,7 @@ public class Send extends Action implements
ContentContainer, ParamsContainer {
long wait = 0L;
long multiplier = 1L;
- if (delayString != null && delayString.trim().length() > 0) {
+ if (delayString != null && !delayString.trim().isEmpty()) {
try {
final String trimDelay = delayString.trim();
@@ -517,7 +517,7 @@ public class Send extends Action implements
ContentContainer, ParamsContainer {
numericDelay = numericDelay.substring(fractionIndex+1);
multiplier /= Math.pow(10, numericDelay.length());
}
- if (numericDelay.length() > 0) {
+ if (!numericDelay.isEmpty()) {
wait += Long.parseLong(numericDelay) * multiplier;
}
} catch (final NumberFormatException nfe) {
diff --git a/src/main/java/org/apache/commons/scxml2/model/Transition.java
b/src/main/java/org/apache/commons/scxml2/model/Transition.java
index bfd6435..174e42c 100644
--- a/src/main/java/org/apache/commons/scxml2/model/Transition.java
+++ b/src/main/java/org/apache/commons/scxml2/model/Transition.java
@@ -132,16 +132,14 @@ public class Transition extends SimpleTransition
implements DocumentOrder {
events.add("*");
break;
}
- else {
- if (token.endsWith("*")) {
- token = token.substring(0, token.length()-1);
- }
- if (token.endsWith(".")) {
- token = token.substring(0, token.length()-1);
- }
- if (token.length() > 0) {
- events.add(token);
- }
+ if (token.endsWith("*")) {
+ token = token.substring(0, token.length()-1);
+ }
+ if (token.endsWith(".")) {
+ token = token.substring(0, token.length()-1);
+ }
+ if (!token.isEmpty()) {
+ events.add(token);
}
}
}
