modules/core/domain/src/main/java/org/rhq/core/domain/util/StringUtils.java | 5
+++--
modules/core/domain/src/test/java/org/rhq/core/domain/util/StringUtilsTest.java | 5
++++-
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit d0b90602d149468f3b546094b78ec7d94626a0a1
Merge: 025c2ad... fc09eea...
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Oct 27 11:52:49 2010 -0400
Merge branch 'master' into delete-agent-plugin
commit fc09eea942a6d0bf1a6a8b176ec97346af1e62ea
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Oct 27 11:51:33 2010 -0400
Adding logic to parse CPUs into CPUs
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/util/StringUtils.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/util/StringUtils.java
index a4dcad4..72e08c1 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/util/StringUtils.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/util/StringUtils.java
@@ -82,8 +82,8 @@ public class StringUtils {
// Make sure to not insert spaces in the middle of acronyms or multi-digit
numbers.
if ((previousChar == ' ' && currentChar != ' ')
|| (Character.isDigit(currentChar) &&
!Character.isDigit(previousChar))
- || (Character.isUpperCase(currentChar) &&
- (i < (target.length() - 1)) &&
Character.isLowerCase(target.charAt(i + 1)))
+ || (Character.isUpperCase(currentChar) && (i <
(target.length() - 1)) &&
+ ((i + 1) < target.length() - 1) &&
Character.isLowerCase(target.charAt(i + 1)))
|| (Character.isUpperCase(currentChar) &&
Character.isLowerCase(previousChar))) {
// We're at the start of a new word.
appendWord(result, currentWord.toString());
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/util/StringUtilsTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/util/StringUtilsTest.java
index 42a0c84..e0c4e5d 100644
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/util/StringUtilsTest.java
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/util/StringUtilsTest.java
@@ -28,7 +28,8 @@ import org.testng.annotations.Test;
*
* @author Ian Springer
*/
-public class StringUtilsTest {
+public class StringUtilsTest {
+
@Test
public void testDeCamelCase() {
testDeCamelCase("RedGreenBlue", "Red Green Blue");
@@ -39,6 +40,7 @@ public class StringUtilsTest {
testDeCamelCase("Blink182", "Blink 182");
testDeCamelCase("SimonAndGarfunkel", "Simon and Garfunkel");
testDeCamelCase("myURL", "My URL");
+ testDeCamelCase("CPUs", "CPUs");
}
private void testDeCamelCase(String input, String expectedResult) {
commit 7df5220ec506bb6d671706d44edf03c5956f9efc
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Oct 27 10:51:19 2010 -0400
Adding logic to handle strings like myURL
Previously myURL was getting parsed into MyURL but it should get parsed
into My URL. This commit adds the necessary logic.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/util/StringUtils.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/util/StringUtils.java
index ec52b1e..a4dcad4 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/util/StringUtils.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/util/StringUtils.java
@@ -83,7 +83,8 @@ public class StringUtils {
if ((previousChar == ' ' && currentChar != ' ')
|| (Character.isDigit(currentChar) &&
!Character.isDigit(previousChar))
|| (Character.isUpperCase(currentChar) &&
- (i < (target.length() - 1)) &&
Character.isLowerCase(target.charAt(i + 1)))) {
+ (i < (target.length() - 1)) &&
Character.isLowerCase(target.charAt(i + 1)))
+ || (Character.isUpperCase(currentChar) &&
Character.isLowerCase(previousChar))) {
// We're at the start of a new word.
appendWord(result, currentWord.toString());
currentWord = new StringBuilder();
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/util/StringUtilsTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/util/StringUtilsTest.java
index fde0c6b..42a0c84 100644
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/util/StringUtilsTest.java
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/util/StringUtilsTest.java
@@ -38,6 +38,7 @@ public class StringUtilsTest {
testDeCamelCase("RHQServer", "RHQ Server");
testDeCamelCase("Blink182", "Blink 182");
testDeCamelCase("SimonAndGarfunkel", "Simon and Garfunkel");
+ testDeCamelCase("myURL", "My URL");
}
private void testDeCamelCase(String input, String expectedResult) {
Show replies by date