cvs commit: cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/impl DefaultLinkService.java

[antonio]

antonio     2004/07/11 10:23:29

  Modified:    src/blocks/portal/java/org/apache/cocoon/portlet
                        ManagedCocoonPortlet.java
               src/blocks/portal/java/org/apache/cocoon/portal/impl
                        DefaultLinkService.java
  Log:
  Allow it compile in Java 1.3
  
  Revision  Changes    Path
  1.3       +4 -4      
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java
  
  Index: ManagedCocoonPortlet.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ManagedCocoonPortlet.java 6 Jul 2004 22:38:28 -0000       1.2
  +++ ManagedCocoonPortlet.java 11 Jul 2004 17:23:29 -0000      1.3
  @@ -39,6 +39,7 @@
   import org.apache.cocoon.environment.portlet.PortletEnvironment;
   import org.apache.cocoon.portlet.multipart.MultipartActionRequest;
   import org.apache.cocoon.portlet.multipart.RequestFactory;
  +import org.apache.cocoon.util.NetUtils;
   import org.apache.cocoon.util.log.Log4JConfigurator;
   
   import org.apache.log.ContextMap;
  @@ -61,7 +62,6 @@
   import java.io.PrintStream;
   import java.net.SocketException;
   import java.net.URL;
  -import java.net.URLDecoder;
   import java.util.HashMap;
   
   /**
  @@ -379,7 +379,7 @@
   
           Environment env;
           try{
  -            env = getEnvironment(servletPath, URLDecoder.decode(uri, 
"UTF-8"), request, res);
  +            env = getEnvironment(servletPath, NetUtils.decode(uri, "UTF-8"), 
request, res);
           } catch (Exception e) {
               if (getLogger().isErrorEnabled()) {
                   getLogger().error("Problem with Cocoon portlet", e);
  @@ -530,7 +530,7 @@
   
           Environment env;
           try{
  -            env = getEnvironment(servletPath, URLDecoder.decode(uri, 
"UTF-8"), request, res);
  +            env = getEnvironment(servletPath, NetUtils.decode(uri, "UTF-8"), 
request, res);
           } catch (Exception e) {
               if (getLogger().isErrorEnabled()) {
                   getLogger().error("Problem with Cocoon portlet", e);
  
  
  
  1.15      +2 -2      
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java
  
  Index: DefaultLinkService.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- DefaultLinkService.java   7 Jun 2004 09:53:34 -0000       1.14
  +++ DefaultLinkService.java   11 Jul 2004 17:23:29 -0000      1.15
  @@ -255,7 +255,7 @@
       public void addUniqueParameterToLink(String name, String value) {
           final Info info = this.getInfo();
           if ( info.hasParameters ) {
  -            final int pos = info.linkBase.indexOf("?");
  +            final int pos = info.linkBase.toString().indexOf("?");
               final String queryString = info.linkBase.substring(pos + 1);
               final RequestParameters params = new 
RequestParameters(queryString);
               if ( params.getParameter(name) != null ) {