svn commit: r788431 - in /myfaces/tobago/trunk: core/src/main/java/org/apache/myfaces/tobago/util/ core/src/test/java/org/apache/myfaces/tobago/util/ theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/

[lo...@apache.org]

Author: lofwyr
Date: Thu Jun 25 16:58:11 2009
New Revision: 788431

URL: http://svn.apache.org/viewvc?rev=788431&view=rev
Log:
code style:
rename StringUtil to StringUtils

Added:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtils.java   (contents, props changed)
      - copied, changed from r788312, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/StringUtilsUnitTest.java   (contents, props changed)
      - copied, changed from r788312, myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/StringUtilUnitTest.java
Removed:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java
    myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/StringUtilUnitTest.java
Modified:
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java

Copied: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtils.java (from r788312, myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtils.java?p2=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtils.java&p1=myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java&r1=788312&r2=788431&rev=788431&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtils.java Thu Jun 25 16:58:11 2009
@@ -17,17 +17,14 @@
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
-import org.apache.commons.lang.StringUtils;
-
 import java.util.ArrayList;
 import java.util.List;
-import java.util.StringTokenizer;
 import java.util.Locale;
+import java.util.StringTokenizer;
 
-public class StringUtil {
+public class StringUtils {
 
-  private StringUtil() {
+  private StringUtils() {
   }
 
   public static String firstToUpperCase(String string) {
@@ -67,10 +64,4 @@
     }
     return buffer.toString();
   }
-
-  public static String escapeAccessKeyIndicator(String label) {
-    return StringUtils.replace(label,
-        String.valueOf(LabelWithAccessKey.INDICATOR), LabelWithAccessKey.ESCAPED_INDICATOR);
-  }
-
 }

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtils.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Copied: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/StringUtilsUnitTest.java (from r788312, myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/StringUtilUnitTest.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/StringUtilsUnitTest.java?p2=myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/StringUtilsUnitTest.java&p1=myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/StringUtilUnitTest.java&r1=788312&r2=788431&rev=788431&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/StringUtilUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/StringUtilsUnitTest.java Thu Jun 25 16:58:11 2009
@@ -19,16 +19,16 @@
 
 import junit.framework.TestCase;
 
-public class StringUtilUnitTest extends TestCase {
+public class StringUtilsUnitTest extends TestCase {
 
   public void test() {
-    assertNull(StringUtil.firstToUpperCase(null));
-    assertEquals("", StringUtil.firstToUpperCase(""));
-    assertEquals("1", StringUtil.firstToUpperCase("1"));
-    assertEquals("X", StringUtil.firstToUpperCase("x"));
-    assertEquals("Xxx", StringUtil.firstToUpperCase("xxx"));
-    assertEquals("XxxXxxx", StringUtil.firstToUpperCase("xxxXxxx"));
-    assertEquals("Xxx", StringUtil.firstToUpperCase("Xxx"));
-    assertEquals(" x ", StringUtil.firstToUpperCase(" x "));
+    assertNull(StringUtils.firstToUpperCase(null));
+    assertEquals("", StringUtils.firstToUpperCase(""));
+    assertEquals("1", StringUtils.firstToUpperCase("1"));
+    assertEquals("X", StringUtils.firstToUpperCase("x"));
+    assertEquals("Xxx", StringUtils.firstToUpperCase("xxx"));
+    assertEquals("XxxXxxx", StringUtils.firstToUpperCase("xxxXxxx"));
+    assertEquals("Xxx", StringUtils.firstToUpperCase("Xxx"));
+    assertEquals(" x ", StringUtils.firstToUpperCase(" x "));
   }
 }

Propchange: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/StringUtilsUnitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/util/StringUtilsUnitTest.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=788431&r1=788430&r2=788431&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Thu Jun 25 16:58:11 2009
@@ -22,7 +22,6 @@
  * $Id$
  */
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import static org.apache.myfaces.tobago.TobagoConstants.SUBCOMPONENT_SEP;
@@ -63,7 +62,7 @@
 import org.apache.myfaces.tobago.util.ComponentUtil;
 import org.apache.myfaces.tobago.util.LayoutInfo;
 import org.apache.myfaces.tobago.util.LayoutUtil;
-import org.apache.myfaces.tobago.util.StringUtil;
+import org.apache.myfaces.tobago.util.StringUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.application.Application;
@@ -205,7 +204,7 @@
     SheetState state = data.getSheetState(facesContext);
     List<Integer> columnWidths = data.getWidthList();
 
-    String selectedRows = StringUtil.joinWithSurroundingSeparator(getSelectedRows(data, state));
+    String selectedRows = StringUtils.joinWithSurroundingSeparator(getSelectedRows(data, state));
     List<UIColumn> renderedColumnList = data.getRenderedColumns();
 
 
@@ -213,7 +212,7 @@
     writer.writeIdAttribute(sheetId + WIDTHS_POSTFIX);
     writer.writeNameAttribute(sheetId + WIDTHS_POSTFIX);
     writer.writeAttribute(HtmlAttributes.TYPE, "hidden", false);
-    writer.writeAttribute(HtmlAttributes.VALUE, StringUtil.joinWithSurroundingSeparator(columnWidths), false);
+    writer.writeAttribute(HtmlAttributes.VALUE, StringUtils.joinWithSurroundingSeparator(columnWidths), false);
     writer.endElement(HtmlConstants.INPUT);
 
     writer.startElement(HtmlConstants.INPUT, null);
@@ -604,7 +603,7 @@
       }
       List<Integer> selectedRows;
       try {
-        selectedRows = StringUtil.parseIntegerList(selected);
+        selectedRows = StringUtils.parseIntegerList(selected);
       } catch (NumberFormatException e) {
         LOG.warn(selected, e);
         selectedRows = Collections.emptyList();
@@ -800,7 +799,7 @@
       String onclick = "Tobago.submitAction(this, '" + sortCommand.getClientId(facesContext) + "')";
       writer.writeAttribute(HtmlAttributes.ONCLICK, onclick, false);
 
-      if (StringUtils.isNotEmpty(tip)) {
+      if (org.apache.commons.lang.StringUtils.isNotEmpty(tip)) {
         tip +=  " - ";
       }
       tip += ResourceManagerUtil.getPropertyNotNull(facesContext, "tobago", "sheetTipSorting");
@@ -1174,7 +1173,7 @@
     }
 
     if (widthListString != null) {
-      currentWidthList = StringUtil.parseIntegerList(widthListString);
+      currentWidthList = StringUtils.parseIntegerList(widthListString);
     }
     if (currentWidthList != null && currentWidthList.size() != rendererdColumns.size()) {
       currentWidthList = null;