KNL-700 Replace use of StringUtil.trimto null with common-lang method

Patch from Jean-François Lévêque ([email protected]) git-svn-id: https://source.sakaiproject.org/svn/alias/trunk@90872 66ffb92e-73f9-0310-93c1-f5514f145a0a
yuyilin · Mar 29, 2011 · bff40d2 · bff40d2
1 parent 709e9c4
commit bff40d2
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/alias/alias-tool/tool/src/java/org/sakaiproject/alias/tool/AliasesAction.java b/alias/alias-tool/tool/src/java/org/sakaiproject/alias/tool/AliasesAction.java
@@ -27,6 +27,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
+
 import org.sakaiproject.alias.api.AliasEdit;
 import org.sakaiproject.alias.cover.AliasService;
 import org.sakaiproject.authz.cover.SecurityService;
@@ -47,7 +49,6 @@
 import org.sakaiproject.exception.InUseException;
 import org.sakaiproject.exception.PermissionException;
 import org.sakaiproject.util.ResourceLoader;
-import org.sakaiproject.util.StringUtil;
 
 /**
  * <p>
@@ -465,8 +466,8 @@ public void doCancel_remove(RunData data, Context context)
 	private boolean readAliasForm(RunData data, SessionState state)
 	{
 		// read the form
-		String id = StringUtil.trimToNull(data.getParameters().getString("id"));
-		String target = StringUtil.trimToNull(data.getParameters().getString("target"));
+		String id = StringUtils.trimToNull(data.getParameters().getString("id"));
+		String target = StringUtils.trimToNull(data.getParameters().getString("target"));
 
 		// get the alias
 		AliasEdit alias = (AliasEdit) state.getAttribute("alias");
@@ -515,7 +516,7 @@ private boolean readAliasForm(RunData data, SessionState state)
 	protected List readResourcesPage(SessionState state, int first, int last)
 	{
 		// search?
-		String search = StringUtil.trimToNull((String) state.getAttribute(STATE_SEARCH));
+		String search = StringUtils.trimToNull((String) state.getAttribute(STATE_SEARCH));
 
 		if (search != null)
 		{
@@ -531,7 +532,7 @@ protected List readResourcesPage(SessionState state, int first, int last)
 	protected int sizeResources(SessionState state)
 	{
 		// search?
-		String search = StringUtil.trimToNull((String) state.getAttribute(STATE_SEARCH));
+		String search = StringUtils.trimToNull((String) state.getAttribute(STATE_SEARCH));
 
 		if (search != null)
 		{