You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ki...@apache.org on 2021/04/28 11:33:30 UTC
[commons-text] 01/03: [TEXT-202] Extract duplicate code
This is an automated email from the ASF dual-hosted git repository.
kinow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-text.git
commit f646dccc4d7ea9f3f228f63487b5fb1079c99717
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Tue Apr 20 07:18:14 2021 +0200
[TEXT-202] Extract duplicate code
---
src/main/java/org/apache/commons/text/StrTokenizer.java | 10 +++-------
src/main/java/org/apache/commons/text/StringTokenizer.java | 11 +++--------
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/apache/commons/text/StrTokenizer.java b/src/main/java/org/apache/commons/text/StrTokenizer.java
index f1e1b74..3f84920 100644
--- a/src/main/java/org/apache/commons/text/StrTokenizer.java
+++ b/src/main/java/org/apache/commons/text/StrTokenizer.java
@@ -803,10 +803,6 @@ public class StrTokenizer implements ListIterator<String>, Cloneable {
continue;
}
- // copy regular character from inside quotes
- workArea.append(srcChars[pos++]);
- trimStart = workArea.size();
-
} else {
// Not in quoting mode
@@ -842,10 +838,10 @@ public class StrTokenizer implements ListIterator<String>, Cloneable {
continue;
}
- // copy regular character from outside quotes
- workArea.append(srcChars[pos++]);
- trimStart = workArea.size();
}
+ // copy regular character from inside quotes
+ workArea.append(srcChars[pos++]);
+ trimStart = workArea.size();
}
// return condition when end of string found
diff --git a/src/main/java/org/apache/commons/text/StringTokenizer.java b/src/main/java/org/apache/commons/text/StringTokenizer.java
index 9cd9922..14f1764 100644
--- a/src/main/java/org/apache/commons/text/StringTokenizer.java
+++ b/src/main/java/org/apache/commons/text/StringTokenizer.java
@@ -810,10 +810,6 @@ public class StringTokenizer implements ListIterator<String>, Cloneable {
continue;
}
- // copy regular character from inside quotes
- workArea.append(srcChars[pos++]);
- trimStart = workArea.size();
-
} else {
// Not in quoting mode
@@ -848,11 +844,10 @@ public class StringTokenizer implements ListIterator<String>, Cloneable {
pos += trimmedLen;
continue;
}
-
- // copy regular character from outside quotes
- workArea.append(srcChars[pos++]);
- trimStart = workArea.size();
}
+ // copy regular character from inside quotes
+ workArea.append(srcChars[pos++]);
+ trimStart = workArea.size();
}
// return condition when end of string found