Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
Message-ID: <20050527140931.83567.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r178779 -
 /cocoon/trunk/src/java/org/apache/cocoon/components/source/SourceUtil.java
Date: Fri, 27 May 2005 14:09:31 -0000
To: cvs@cocoon.apache.org
From: vgritsenko@apache.org

Author: vgritsenko
Date: Fri May 27 07:09:30 2005
New Revision: 178779

URL: http://svn.apache.org/viewcvs?rev=3D178779&view=3Drev
Log:
remove dead code

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/components/source/SourceUtil.ja=
va

Modified: cocoon/trunk/src/java/org/apache/cocoon/components/source/SourceU=
til.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/=
components/source/SourceUtil.java?rev=3D178779&r1=3D178778&r2=3D178779&view=
=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- cocoon/trunk/src/java/org/apache/cocoon/components/source/SourceUtil.ja=
va (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/source/SourceUtil.ja=
va Fri May 27 07:09:30 2005
@@ -15,21 +15,11 @@
  */
 package org.apache.cocoon.components.source;
=20
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.xml.transform.OutputKeys;
-
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
 import org.apache.avalon.framework.service.ServiceSelector;
+
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.ResourceNotFoundException;
 import org.apache.cocoon.environment.internal.EnvironmentHelper;
@@ -39,6 +29,7 @@
 import org.apache.cocoon.xml.XMLUtils;
 import org.apache.cocoon.xml.dom.DOMBuilder;
 import org.apache.cocoon.xml.dom.DOMStreamer;
+
 import org.apache.excalibur.source.ModifiableSource;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceException;
@@ -59,6 +50,17 @@
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
=20
+import javax.xml.transform.OutputKeys;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
 /**
  * This class contains some utility methods for the source resolving.
  *
@@ -80,7 +82,7 @@
     }
=20
     /** Avoid instantiation */
-    protected SourceUtil() {
+    private SourceUtil() {
     }
=20
     /**
@@ -510,27 +512,18 @@
                 resourceParameters.hasParameters()) {
             int pos =3D uri.indexOf(";jsessionid=3D");
=20
-            if (!uri.startsWith("cocoon:")) {
-                // It looks like this block is never called (JT)
-                if (pos!=3D-1) {
-                    uri =3D uri.substring(0, pos);
-                }
-                uri =3D org.apache.excalibur.source.SourceUtil.appendParam=
eters(uri, resourceParameters);
+            StringBuffer buf;
+            if (pos =3D=3D -1) {
+                buf =3D new StringBuffer(uri);
             } else {
-                StringBuffer buf;
-
-                if (pos =3D=3D -1) {
-                    buf =3D new StringBuffer(uri);
-                } else {
-                    buf =3D new StringBuffer(uri.substring(0, pos));
-                }
-                buf.append(((uri.indexOf('?') =3D=3D -1) ? '?' : '&'));
-                buf.append(resourceParameters.getEncodedQueryString());
-                uri =3D buf.toString();
+                buf =3D new StringBuffer(uri.substring(0, pos));
             }
+            buf.append(((uri.indexOf('?') =3D=3D -1) ? '?' : '&'));
+            buf.append(resourceParameters.getEncodedQueryString());
+            uri =3D buf.toString();
         }
-        Map resolverParameters =3D new java.util.HashMap();
=20
+        Map resolverParameters =3D new HashMap();
         resolverParameters.put(SourceResolver.METHOD, method);
         if (typeParameters !=3D null) {
             String encoding =3D typeParameters.getParameter("encoding",
@@ -705,8 +698,7 @@
=20
         Source source =3D null;
         try {
-            source =3D SourceUtil.getSource(location, typeParameters,
-                                          parameters, resolver);
+            source =3D SourceUtil.getSource(location, typeParameters, para=
meters, resolver);
             Document doc =3D SourceUtil.toDOM(source);
=20
             DocumentFragment fragment =3D doc.createDocumentFragment();