antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 5 Projects Releases 5 Activity Actions

Switched back from custum UrlEncoder to standard

Browse source 
java.net.URLEncoder class.
This commit is contained in:
hns 2001-12-02 22:52:20 +00:00
parent 246e79fa14
commit 9622366678
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/helma/framework/core/Application.java
View file

@ -3,10 +3,6 @@
package helma.framework.core; package helma.framework.core;
import java.io.*;
import java.lang.reflect.*;
import java.rmi.*;
import java.rmi.server.*;
import helma.framework.*; import helma.framework.*;
import helma.scripting.*; import helma.scripting.*;
import helma.scripting.fesi.ESUser; import helma.scripting.fesi.ESUser;
@ -16,6 +12,11 @@ import helma.xmlrpc.*;
import helma.util.*; import helma.util.*;
import com.sleepycat.db.DbException; import com.sleepycat.db.DbException;
import java.util.*; import java.util.*;
import java.io.*;
import java.net.URLEncoder;
import java.lang.reflect.*;
import java.rmi.*;
import java.rmi.server.*;
/** /**
* The central class of a Helma application. This class keeps a pool of so-called * The central class of a Helma application. This class keeps a pool of so-called
@ -688,12 +689,12 @@ public class Application extends UnicastRemoteObject implements IRemoteApp, IRep
// users always have a canonical URL like /users/username // users always have a canonical URL like /users/username
if ("user".equals (getPrototypeName (p))) { if ("user".equals (getPrototypeName (p))) {
b.insert (0, UrlEncoder.encode (getElementName (p))); b.insert (0, URLEncoder.encode (getElementName (p)));
p = users; p = users;
break; break;
} }
b.insert (0, UrlEncoder.encode (getElementName (p))); b.insert (0, URLEncoder.encode (getElementName (p)));
p = getParentElement (p); p = getParentElement (p);
@ -707,7 +708,7 @@ public class Application extends UnicastRemoteObject implements IRemoteApp, IRep
} }
if (actionName != null) if (actionName != null)
b.append (UrlEncoder.encode (actionName)); b.append (URLEncoder.encode (actionName));
return baseURI + b.toString (); return baseURI + b.toString ();
} }

8
src/helma/framework/core/Skin.java
View file

@ -3,14 +3,14 @@
package helma.framework.core; package helma.framework.core;
import java.io.*;
import java.util.*;
import helma.framework.*; import helma.framework.*;
import helma.scripting.*; import helma.scripting.*;
import helma.objectmodel.INode; import helma.objectmodel.INode;
import helma.objectmodel.ConcurrencyException; import helma.objectmodel.ConcurrencyException;
import helma.util.HtmlEncoder; import helma.util.HtmlEncoder;
import helma.util.UrlEncoder; import java.net.URLEncoder;
import java.io.*;
import java.util.*;
/** /**
* This represents a Helma skin, i.e. a template created from JavaScript. It uses the request path array * This represents a Helma skin, i.e. a template created from JavaScript. It uses the request path array
@ -391,7 +391,7 @@ public class Skin {
if ("form".equalsIgnoreCase (encoding)) if ("form".equalsIgnoreCase (encoding))
return HtmlEncoder.encodeFormValue (text); return HtmlEncoder.encodeFormValue (text);
if ("url".equalsIgnoreCase (encoding)) if ("url".equalsIgnoreCase (encoding))
return UrlEncoder.encode (text); return URLEncoder.encode (text);
return text; return text;
} }