inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

More files now using correct URLEncoder impl, some code cleanup around usage and imports

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7961 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2008-01-09 15:47:13 +00:00
parent aafc95b78f
commit 11d068198f
2 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/java/org/alfresco/repo/web/scripts/bean/KeywordSearch.java
View File

@@ -25,9 +25,7 @@
package org.alfresco.repo.web.scripts.bean; package org.alfresco.repo.web.scripts.bean;
import java.io.StringWriter; import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.io.Writer; import java.io.Writer;
import java.net.URLEncoder;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
@@ -45,6 +43,7 @@ import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.util.GUID; import org.alfresco.util.GUID;
import org.alfresco.util.ParameterCheck; import org.alfresco.util.ParameterCheck;
import org.alfresco.util.URLEncoder;
import org.alfresco.web.scripts.DeclarativeWebScript; import org.alfresco.web.scripts.DeclarativeWebScript;
import org.alfresco.web.scripts.Status; import org.alfresco.web.scripts.Status;
import org.alfresco.web.scripts.WebScriptException; import org.alfresco.web.scripts.WebScriptException;
@@ -409,18 +408,11 @@ public class KeywordSearch extends DeclarativeWebScript
@Override @Override
public String getUrl() public String getUrl()
{ {
try return MessageFormat.format(URL, new Object[] {
{ getNodeRef().getStoreRef().getProtocol(),
return MessageFormat.format(URL, new Object[] { getNodeRef().getStoreRef().getIdentifier(),
getNodeRef().getStoreRef().getProtocol(), getNodeRef().getId(),
getNodeRef().getStoreRef().getIdentifier(), URLEncoder.encode(getName()) } );
getNodeRef().getId(),
StringUtils.replace(URLEncoder.encode(getName(), "UTF-8"), "+", "%20") } );
}
catch (UnsupportedEncodingException err)
{
throw new TemplateException("Failed to encode content URL for node: " + getNodeRef(), err);
}
} }
} }

13
source/java/org/alfresco/web/ui/repo/component/UIAjaxFilePicker.java
View File

@@ -24,13 +24,11 @@
*/ */
package org.alfresco.web.ui.repo.component; package org.alfresco.web.ui.repo.component;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
import javax.faces.el.ValueBinding; import javax.faces.el.ValueBinding;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.util.URLEncoder;
import org.alfresco.web.ui.common.Utils; import org.alfresco.web.ui.common.Utils;
/** /**
@@ -89,14 +87,7 @@ public class UIAjaxFilePicker extends BaseAjaxItemPicker
String mimetypes = getMimetypes(); String mimetypes = getMimetypes();
if (mimetypes != null) if (mimetypes != null)
{ {
try return "mimetypes=" + URLEncoder.encode(mimetypes);
{
return "mimetypes=" + URLEncoder.encode(mimetypes, "UTF-8");
}
catch (UnsupportedEncodingException e)
{
throw new AlfrescoRuntimeException("Unsupported encoding.", e);
}
} }
else else
{ {