Menu
▾
▴
[Exist-commits] SF.net SVN: exist:[11730] trunk/eXist/src/org/exist/http
|
From: <br...@us...> - 2010-04-29 14:07:06
|
Revision: 11730
http://exist.svn.sourceforge.net/exist/?rev=11730&view=rev
Author: brihaye
Date: 2010-04-29 14:06:59 +0000 (Thu, 29 Apr 2010)
Log Message:
-----------
stronger typing, commented out unused variables
Modified Paths:
--------------
trunk/eXist/src/org/exist/http/servlets/RequestWrapper.java
trunk/eXist/src/org/exist/http/servlets/SessionWrapper.java
trunk/eXist/src/org/exist/http/servlets/XSLTServlet.java
trunk/eXist/src/org/exist/http/webdav/methods/Propfind.java
trunk/eXist/src/org/exist/http/webdav/methods/Put.java
Modified: trunk/eXist/src/org/exist/http/servlets/RequestWrapper.java
===================================================================
--- trunk/eXist/src/org/exist/http/servlets/RequestWrapper.java 2010-04-29 14:04:52 UTC (rev 11729)
+++ trunk/eXist/src/org/exist/http/servlets/RequestWrapper.java 2010-04-29 14:06:59 UTC (rev 11730)
@@ -38,7 +38,7 @@
public Object getAttribute(String name);
- public Enumeration getAttributeNames();
+ public Enumeration<String> getAttributeNames();
public String getCharacterEncoding();
@@ -62,7 +62,7 @@
public String getParameter(String arg0);
- public Enumeration getParameterNames();
+ public Enumeration<String> getParameterNames();
public String[] getParameterValues(String arg0);
Modified: trunk/eXist/src/org/exist/http/servlets/SessionWrapper.java
===================================================================
--- trunk/eXist/src/org/exist/http/servlets/SessionWrapper.java 2010-04-29 14:04:52 UTC (rev 11729)
+++ trunk/eXist/src/org/exist/http/servlets/SessionWrapper.java 2010-04-29 14:06:59 UTC (rev 11730)
@@ -31,7 +31,7 @@
public Object getAttribute(String arg0);
- public Enumeration getAttributeNames();
+ public Enumeration<String> getAttributeNames();
public long getCreationTime();
Modified: trunk/eXist/src/org/exist/http/servlets/XSLTServlet.java
===================================================================
--- trunk/eXist/src/org/exist/http/servlets/XSLTServlet.java 2010-04-29 14:04:52 UTC (rev 11729)
+++ trunk/eXist/src/org/exist/http/servlets/XSLTServlet.java 2010-04-29 14:06:59 UTC (rev 11730)
@@ -401,9 +401,9 @@
*/
private void setTransformerParameters(HttpServletRequest request, Transformer transformer) throws XPathException {
- for (Enumeration e = request.getAttributeNames(); e.hasMoreElements(); ) {
+ for (Enumeration<String> e = request.getAttributeNames(); e.hasMoreElements(); ) {
- String name = (String) e.nextElement();
+ String name = e.nextElement();
if (name.startsWith(REQ_ATTRIBUTE_PREFIX) &&
!(name.startsWith(REQ_ATTRIBUTE_OUTPUT) || REQ_ATTRIBUTE_INPUT.equals(name)
|| REQ_ATTRIBUTE_STYLESHEET.equals(name))) {
@@ -424,8 +424,8 @@
* Copies 'output' attributes to properties object.
*/
private void setOutputProperties(HttpServletRequest request, Properties properties) {
- for (Enumeration e = request.getAttributeNames(); e.hasMoreElements(); ) {
- String name = (String) e.nextElement();
+ for (Enumeration<String> e = request.getAttributeNames(); e.hasMoreElements(); ) {
+ String name = e.nextElement();
if (name.startsWith(REQ_ATTRIBUTE_OUTPUT)) {
Object value = request.getAttribute(name);
if (value != null){
Modified: trunk/eXist/src/org/exist/http/webdav/methods/Propfind.java
===================================================================
--- trunk/eXist/src/org/exist/http/webdav/methods/Propfind.java 2010-04-29 14:04:52 UTC (rev 11729)
+++ trunk/eXist/src/org/exist/http/webdav/methods/Propfind.java 2010-04-29 14:06:59 UTC (rev 11730)
@@ -108,18 +108,18 @@
private final static QName SUPPORTED_LOCK_PROP = new QName("supportedlock", WebDAV.DAV_NS, PREFIX);
private final static QName EXCLUSIVE_LOCK_PROP = new QName("exclusive", WebDAV.DAV_NS, PREFIX);
private final static QName WRITE_LOCK_PROP = new QName("write", WebDAV.DAV_NS, PREFIX);
- private final static QName ETAG_PROP = new QName("etag", WebDAV.DAV_NS, PREFIX);
+ //private final static QName ETAG_PROP = new QName("etag", WebDAV.DAV_NS, PREFIX);
private final static QName STATUS_PROP = new QName("status", WebDAV.DAV_NS, PREFIX);
private final static QName COLLECTION_PROP = new QName("collection", WebDAV.DAV_NS, PREFIX);
private final static QName LOCK_DISCOVERY_PROP = new QName("lockdiscovery", WebDAV.DAV_NS, PREFIX);
- private final static QName ACTIVELOCK_PROP = new QName("activelock", WebDAV.DAV_NS, PREFIX);
+ //private final static QName ACTIVELOCK_PROP = new QName("activelock", WebDAV.DAV_NS, PREFIX);
private final static QName LOCKTYPE_PROP = new QName("activelock", WebDAV.DAV_NS, PREFIX);
private final static QName LOCK_SCOPE_PROP = new QName("lockscope", WebDAV.DAV_NS, PREFIX);
private final static QName LOCK_DEPTH_PROP = new QName("depth", WebDAV.DAV_NS, PREFIX);
private final static QName LOCK_OWNER_PROP = new QName("owner", WebDAV.DAV_NS, PREFIX);
private final static QName LOCK_TIMEOUT_PROP = new QName("timeout", WebDAV.DAV_NS, PREFIX);
- private final static QName LOCK_TOKEN_PROP = new QName("locktocken", WebDAV.DAV_NS, PREFIX);
+ //private final static QName LOCK_TOKEN_PROP = new QName("locktocken", WebDAV.DAV_NS, PREFIX);
private final static QName[] DEFAULT_COLLECTION_PROPS = {
Modified: trunk/eXist/src/org/exist/http/webdav/methods/Put.java
===================================================================
--- trunk/eXist/src/org/exist/http/webdav/methods/Put.java 2010-04-29 14:04:52 UTC (rev 11729)
+++ trunk/eXist/src/org/exist/http/webdav/methods/Put.java 2010-04-29 14:06:59 UTC (rev 11730)
@@ -133,7 +133,7 @@
LOG.debug("Create '0 byte' place for XML resource");
String txt="<!-- place holder for null byte sized XML document --><null/>";
- InputSource is = new InputSource(url);
+ //InputSource is = new InputSource(url);
IndexInfo info = collection.validateXMLResource(txn, broker, pathUri, txt);
doc = info.getDocument();
doc.getMetadata().setMimeType(contentType);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|