[Exist-commits] eXist-1.0/src/org/exist/xquery/functions/request RequestHostname.java,1.1,1.2 UnescapeURI.java,1.3,1.4 RequestURI.java,1.3,1.4 StreamBinary.java,1.2,1.3

[Pierrick B. <br...@us...>]

Update of /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/request
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32584/src/org/exist/xquery/functions/request

Modified Files:
	RequestHostname.java UnescapeURI.java RequestURI.java 
	StreamBinary.java 
Log Message:
Organised imports

Index: UnescapeURI.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/request/UnescapeURI.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** UnescapeURI.java	8 Aug 2005 20:22:36 -0000	1.3
--- UnescapeURI.java	4 Jan 2006 20:26:01 -0000	1.4
***************
*** 23,31 ****
  package org.exist.xquery.functions.request;
  
  import org.exist.dom.QName;
  import org.exist.xquery.BasicFunction;
  import org.exist.xquery.Cardinality;
  import org.exist.xquery.FunctionSignature;
- import org.exist.xquery.Variable;
  import org.exist.xquery.XPathException;
  import org.exist.xquery.XQueryContext;
--- 23,32 ----
  package org.exist.xquery.functions.request;
  
+ import java.net.URLDecoder;
+ 
  import org.exist.dom.QName;
  import org.exist.xquery.BasicFunction;
  import org.exist.xquery.Cardinality;
  import org.exist.xquery.FunctionSignature;
  import org.exist.xquery.XPathException;
  import org.exist.xquery.XQueryContext;
***************
*** 35,40 ****
  import org.exist.xquery.value.Type;
  
- import java.net.URLDecoder;
- 
  /**
   * @author Adam Retter (ada...@de...)
--- 36,39 ----

Index: RequestURI.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/request/RequestURI.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RequestURI.java	29 Oct 2004 08:20:54 -0000	1.3
--- RequestURI.java	4 Jan 2006 20:26:01 -0000	1.4
***************
*** 72,76 ****
  
  		JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
! 		String uri;
  		if (value.getObject() instanceof RequestWrapper)
  			return new StringValue(((RequestWrapper) value.getObject()).getRequestURI());
--- 72,76 ----
  
  		JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
! 		
  		if (value.getObject() instanceof RequestWrapper)
  			return new StringValue(((RequestWrapper) value.getObject()).getRequestURI());

Index: StreamBinary.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/request/StreamBinary.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** StreamBinary.java	5 Oct 2005 20:35:31 -0000	1.2
--- StreamBinary.java	4 Jan 2006 20:26:01 -0000	1.3
***************
*** 26,31 ****
  import java.io.OutputStream;
  
- import javax.xml.transform.stream.StreamResult;
- 
  import org.exist.dom.QName;
  import org.exist.http.servlets.ResponseWrapper;
--- 26,29 ----
***************
*** 36,40 ****
  import org.exist.xquery.XPathException;
  import org.exist.xquery.XQueryContext;
- import org.exist.xquery.functions.util.UtilModule;
  import org.exist.xquery.value.Base64Binary;
  import org.exist.xquery.value.JavaObjectValue;
--- 34,37 ----
***************
*** 42,46 ****
  import org.exist.xquery.value.SequenceType;
  import org.exist.xquery.value.Type;
- import org.xml.sax.SAXException;
  
  public class StreamBinary extends BasicFunction {
--- 39,42 ----

Index: RequestHostname.java
===================================================================
RCS file: /cvsroot/exist/eXist-1.0/src/org/exist/xquery/functions/request/RequestHostname.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RequestHostname.java	2 Feb 2005 19:14:08 -0000	1.1
--- RequestHostname.java	4 Jan 2006 20:26:01 -0000	1.2
***************
*** 72,76 ****
  
  		JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
! 		String uri;
  		if (value.getObject() instanceof RequestWrapper)
  			return new StringValue(((RequestWrapper) value.getObject()).getRemoteHost());
--- 72,76 ----
  
  		JavaObjectValue value = (JavaObjectValue) var.getValue().itemAt(0);
! 		
  		if (value.getObject() instanceof RequestWrapper)
  			return new StringValue(((RequestWrapper) value.getObject()).getRemoteHost());