Index: SectionPage.java =================================================================== --- SectionPage.java (revision 2) +++ SectionPage.java (working copy) @@ -41,6 +41,7 @@ import java.util.Collection; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.net.URLDecoder; import javax.faces.application.FacesMessage; import javax.faces.component.UICommand; @@ -1248,14 +1249,22 @@ * @return Returns the secResourceName. */ public String getSecResourceName() { - return secResourceName; + try{ + String url =URLDecoder.decode(secResourceName,"UTF-8"); + secResourceName=url; + return secResourceName; + }catch(Exception e) { + return "about:blank"; + } } /** * @param secResourceName The secResourceName to set. */ public void setSecResourceName(String secResourceName) { + this.secResourceName = secResourceName; + } /** @@ -1385,8 +1394,17 @@ * @return Returns the uploadFileName. */ public String getUploadFileName() { - if(secResourceName != null && secResourceName.length() !=0) uploadFileName = secResourceName; + try{ + if(secResourceName != null && secResourceName.length() !=0) { + uploadFileName = secResourceName; + String url =URLDecoder.decode(uploadFileName,"UTF-8"); + uploadFileName=url; + } return uploadFileName; + }catch(Exception e) + { + return "about:blank"; + } } /** * @param uploadFileName The uploadFileName to set. @@ -1434,8 +1452,9 @@ { try { - ContentResource cr = getMeleteCHService().getResource(meleteResource.getResourceId()); - String rUrl = cr.getUrl().replaceAll(" ", "%20"); + ContentResource cr = getMeleteCHService().getResource(meleteResource.getResourceId()); + String rUrl = cr.getUrl().replaceAll(" ", "%20"); + return rUrl; } catch (Exception e) @@ -1513,7 +1532,14 @@ */ public String getSelectedResourceName() { + try{ + String url =URLDecoder.decode(selectedResourceName,"UTF-8"); + selectedResourceName=url; return selectedResourceName; + }catch (Exception e) + { + return "about:blank"; + } } /** @@ -1633,7 +1659,14 @@ * @return Returns the resource_title. */ public String getResource_title() { + try{ + String url =URLDecoder.decode(resource_title,"UTF-8"); + resource_title=url; return resource_title; + }catch(Exception e) + { + return "about:blank"; + } } /** * @param resource_title The resource_title to set. @@ -1645,6 +1678,7 @@ * @return Returns the resource_url. */ public String getResource_url() { + return resource_url; } /**