jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r915333 [1/3] - in /jackrabbit/trunk/jackrabbit-webdav/src: main/java/org/apache/jackrabbit/webdav/ main/java/org/apache/jackrabbit/webdav/bind/ main/java/org/apache/jackrabbit/webdav/client/methods/ main/java/org/apache/jackrabbit/webdav/h...
Date Tue, 23 Feb 2010 13:27:13 GMT
Author: angela
Date: Tue Feb 23 13:27:10 2010
New Revision: 915333

URL: http://svn.apache.org/viewvc?rev=915333&view=rev
Log:
JCR-2509 : Reduce number of compiler warning by adding @Override and generics where appropriate [step 1: jackrabbit-webdav]

in addition:
- fix indention
- minor improvements in comments
- use foreach loops where possible
- introduce PropEntry marker interface as common base for DavProperty and DavPropertyName
- add o.a.j.webdav.lock.Type.hashCode

Added:
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/PropEntry.java   (with props)
Modified:
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavMethods.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavResource.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavResourceIterator.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavResourceIteratorImpl.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavServletRequest.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatusResponse.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/bind/BindableResource.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/bind/ParentSet.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/AclMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/BaselineControlMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/BindMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/CheckinMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/CheckoutMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/CopyMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/DavMethodBase.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/DeleteMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/LabelMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/LockMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MergeMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MkActivityMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MkColMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MkWorkspaceMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MoveMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/OptionsMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/OrderPatchMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PollMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropFindMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropPatchMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PutMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/RebindMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/ReportMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/SearchMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/SubscribeMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnLockMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnSubscribeMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnbindMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UncheckoutMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UpdateMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/VersionControlMethod.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/header/IfHeader.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/header/PollTimeoutHeader.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/LockDiscovery.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Scope.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/SimpleLockManager.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/SupportedLock.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/lock/Type.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/observation/DefaultEventType.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/observation/EventDiscovery.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/observation/SubscriptionDiscovery.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/observation/SubscriptionInfo.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/ordering/OrderPatch.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/ordering/OrderingType.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/ordering/Position.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/AbstractDavProperty.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DavProperty.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DavPropertyIterator.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DavPropertyName.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DavPropertyNameIterator.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DavPropertyNameSet.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DavPropertySet.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/DefaultDavProperty.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/HrefProperty.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/PropContainer.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/property/ResourceType.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/search/QueryGrammerSet.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/search/SearchInfo.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/AclProperty.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/AclRestrictionsProperty.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/CurrentUserPrivilegeSetProperty.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/Principal.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/Privilege.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/SupportedPrivilege.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/SupportedPrivilegeSetProperty.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/report/AbstractSecurityReport.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/report/AclPrincipalReport.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/report/PrincipalMatchReport.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/report/PrincipalSearchReport.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/security/report/SearchablePropertyReport.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/server/AbstractWebdavServlet.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/transaction/TxActiveLock.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/LabelSetProperty.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/MergeInfo.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/OptionsInfo.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/OptionsResponse.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/SupportedMethodSetProperty.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/UpdateInfo.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/CompareBaselineReport.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ExpandPropertyReport.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/LatestActivityVersionReport.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/LocateByHistoryReport.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportInfo.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/ReportType.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/SupportedReportSetProperty.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/version/report/VersionTreeReport.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/DomUtil.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/ElementIterator.java
    jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/xml/Namespace.java
    jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/client/methods/DavMethodTest.java
    jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/io/OutputContextImplTest.java
    jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/lock/ActiveLockTest.java
    jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/server/RFC4918DestinationHeaderTest.java
    jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/server/RFC4918IfHeaderTest.java
    jackrabbit/trunk/jackrabbit-webdav/src/test/java/org/apache/jackrabbit/webdav/server/RFC4918PropfindTest.java

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/AbstractLocatorFactory.java Tue Feb 23 13:27:10 2010
@@ -363,6 +363,7 @@
          *
          * @return the hash code
          */
+        @Override
         public int hashCode() {
             return href.hashCode();
         }
@@ -375,6 +376,7 @@
          * @return <code>true</code> if the 2 objects are equal;
          *         <code>false</code> otherwise
          */
+        @Override
         public boolean equals(Object obj) {
             if (obj == this) {
                 return true;
@@ -386,4 +388,4 @@
             return false;
         }
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavMethods.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavMethods.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavMethods.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavMethods.java Tue Feb 23 13:27:10 2010
@@ -20,6 +20,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
+import java.util.Map;
 
 /**
  * <code>DavMethods</code> defines constants for the WebDAV METHODS.
@@ -31,7 +32,7 @@
     /**
      * A hashmap of webdav METHODS
      */
-    private static HashMap methodMap = new HashMap();
+    private static Map<String, Integer> methodMap = new HashMap<String, Integer>();
 
     /**
      * An array of method codes that are affected by a Label header
@@ -287,9 +288,9 @@
      * Valid type codes > 0
      */
     public static int getMethodCode(String method) {
-        Integer code = (Integer) methodMap.get(method.toUpperCase());
+        Integer code = methodMap.get(method.toUpperCase());
         if (code != null) {
-            return code.intValue();
+            return code;
         }
         return 0;
     }
@@ -298,7 +299,7 @@
      * Static intializer for methodTable hashmap
      */
     private static void addMethodCode(String method, int code) {
-        methodMap.put(method, new Integer(code));
+        methodMap.put(method, code);
     }
 
     /**
@@ -382,8 +383,8 @@
      */
     public static boolean isMethodAffectedByLabel(DavServletRequest request) {
         int code = getMethodCode(request.getMethod());
-        for (int i = 0; i < labelMethods.length; i++) {
-            if (code == labelMethods[i]) {
+        for (int labelMethod : labelMethods) {
+            if (code == labelMethod) {
                 return true;
             }
         }
@@ -398,8 +399,8 @@
      */
     public static boolean isDeltaVMethod(DavServletRequest request) {
         int code = getMethodCode(request.getMethod());
-        for (int i = 0; i < deltaVMethods.length; i++) {
-            if (code == deltaVMethods[i]) {
+        for (int deltaVMethod : deltaVMethods) {
+            if (code == deltaVMethod) {
                 return true;
             }
         }

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavResource.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavResource.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavResource.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavResource.java Tue Feb 23 13:27:10 2010
@@ -26,6 +26,7 @@
 import org.apache.jackrabbit.webdav.property.DavProperty;
 import org.apache.jackrabbit.webdav.property.DavPropertyName;
 import org.apache.jackrabbit.webdav.property.DavPropertySet;
+import org.apache.jackrabbit.webdav.property.PropEntry;
 
 import java.io.IOException;
 import java.util.List;
@@ -137,7 +138,7 @@
      * @return the {@link DavProperty} with the given name or <code>null</code>
      * if the property does not exist.
      */
-    public DavProperty getProperty(DavPropertyName name);
+    public DavProperty<?> getProperty(DavPropertyName name);
 
     /**
      * Returns all webdav properties present on this resource.
@@ -153,7 +154,7 @@
      * @param property
      * @throws DavException if an error occurs
      */
-    public void setProperty(DavProperty property) throws DavException;
+    public void setProperty(DavProperty<?> property) throws DavException;
 
     /**
      * Remove the specified property from this resource.
@@ -176,7 +177,7 @@
      * general state of the resource prevents any properties to be set or removed
      * (e.g. due to a lock).
      */
-    public MultiStatusResponse alterProperties(List changeList) throws DavException;
+    public MultiStatusResponse alterProperties(List<? extends PropEntry> changeList) throws DavException;
 
     /**
      * Retrieve the resource this resource is internal member of.

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavResourceIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavResourceIterator.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavResourceIterator.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavResourceIterator.java Tue Feb 23 13:27:10 2010
@@ -23,7 +23,7 @@
  * METHODS allow to retrieve the next {@link DavResource} from the iterator
  * and the iterators size.
  */
-public interface DavResourceIterator extends Iterator {
+public interface DavResourceIterator extends Iterator<DavResource> {
 
     /**
      * Returns the next {@link DavResource} in the iterator

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavResourceIteratorImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavResourceIteratorImpl.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavResourceIteratorImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavResourceIteratorImpl.java Tue Feb 23 13:27:10 2010
@@ -21,6 +21,7 @@
 
 import java.util.Iterator;
 import java.util.List;
+import java.util.Collections;
 
 /**
  * <code>DavResourceIteratorImpl</code> implementation of the {@link DavResourceIterator}
@@ -31,14 +32,16 @@
 
     private static Logger log = LoggerFactory.getLogger(DavResourceIteratorImpl.class);
 
-    private Iterator it;
+    public static DavResourceIterator EMPTY = new DavResourceIteratorImpl(Collections.<DavResource>emptyList());
+
+    private Iterator<DavResource> it;
     private int size;
 
     /**
      * Create a new DavResourceIterator from the specified list.
      * @param list
      */
-    public DavResourceIteratorImpl(List list) {
+    public DavResourceIteratorImpl(List<DavResource> list) {
         it = list.iterator();
         size = list.size();
     }
@@ -53,7 +56,7 @@
     /**
      * @see DavResourceIterator#next()
      */
-    public Object next() {
+    public DavResource next() {
         return it.next();
     }
 
@@ -61,7 +64,7 @@
      * @see DavResourceIterator#nextResource()
      */
     public DavResource nextResource() {
-        return (DavResource) next();
+        return next();
     }
 
     /**
@@ -79,4 +82,4 @@
     public void remove() {
         throw new UnsupportedOperationException("Remove not allowed with DavResourceIteratorImpl");
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavServletRequest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavServletRequest.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavServletRequest.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/DavServletRequest.java Tue Feb 23 13:27:10 2010
@@ -20,6 +20,7 @@
 import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
 import org.apache.jackrabbit.webdav.property.DavProperty;
 import org.apache.jackrabbit.webdav.property.DavPropertyName;
+import org.apache.jackrabbit.webdav.property.PropEntry;
 import org.w3c.dom.Document;
 
 import javax.servlet.http.HttpServletRequest;
@@ -160,7 +161,7 @@
      * @return {@link List} of property change operations
      * @throws DavException In case of invalid request body
      */
-    public List getPropPatchChangeList() throws DavException;
+    public List<? extends PropEntry> getPropPatchChangeList() throws DavException;
 
     /**
      * Return the parsed 'lockinfo' request body, the {@link DavConstants#HEADER_TIMEOUT

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatus.java Tue Feb 23 13:27:10 2010
@@ -23,7 +23,6 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -37,7 +36,7 @@
      * Map collecting the responses for this multistatus, where every href must
      * only occure one single time.
      */
-    private Map responses = new LinkedHashMap();
+    private Map<String, MultiStatusResponse> responses = new LinkedHashMap<String, MultiStatusResponse>();
 
     /**
      * A general response description at the multistatus top level is used to
@@ -120,7 +119,7 @@
      * multistatus.
      */
     public MultiStatusResponse[] getResponses() {
-        return (MultiStatusResponse[]) responses.values().toArray(new MultiStatusResponse[responses.size()]);
+        return responses.values().toArray(new MultiStatusResponse[responses.size()]);
     }
 
     /**
@@ -149,9 +148,8 @@
      */
     public Element toXml(Document document) {
         Element multistatus = DomUtil.createElement(document, XML_MULTISTATUS, NAMESPACE);
-        Iterator it = responses.values().iterator();
-        while(it.hasNext()) {
-            multistatus.appendChild(((MultiStatusResponse)it.next()).toXml(document));
+        for (MultiStatusResponse resp : responses.values()) {
+            multistatus.appendChild(resp.toXml(document));
         }
         if (responseDescription != null) {
             Element respDesc = DomUtil.createElement(document, XML_RESPONSEDESCRIPTION, NAMESPACE, responseDescription);

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatusResponse.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatusResponse.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatusResponse.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/MultiStatusResponse.java Tue Feb 23 13:27:10 2010
@@ -72,7 +72,7 @@
     /**
      * Type of MultiStatus response: PropStat Hashmap containing all status
      */
-    private HashMap statusMap = new HashMap();
+    private HashMap<Integer, PropContainer> statusMap = new HashMap<Integer, PropContainer>();
 
     private MultiStatusResponse(String href, String responseDescription, int type) {
         if (!isValidHref(href)) {
@@ -167,9 +167,8 @@
         // only property names requested
         if (propFindType == PROPFIND_PROPERTY_NAMES) {
             PropContainer status200 = getPropContainer(DavServletResponse.SC_OK, true);
-            DavPropertyName[] propNames = resource.getPropertyNames();
-            for (int i = 0; i < propNames.length; i++) {
-                status200.addContent(propNames[i]);
+            for (DavPropertyName propName : resource.getPropertyNames()) {
+                status200.addContent(propName);
             }
             // all or a specified set of property and their values requested.
         } else {
@@ -180,7 +179,7 @@
             // non-protected properties plus requested properties (allprop/include) 
             DavPropertyIterator iter = resource.getProperties().iterator();
             while (iter.hasNext()) {
-                DavProperty property = iter.nextProperty();
+                DavProperty<?> property = iter.nextProperty();
                 boolean allDeadPlusRfc4918LiveProperties =
                     propFindType == PROPFIND_ALL_PROP || propFindType == PROPFIND_ALL_PROP_INCLUDE;
                 boolean wasRequested = propNameSet.remove(property.getName());
@@ -231,10 +230,10 @@
         Status[] sts;
         if (type == TYPE_PROPSTAT) {
             sts = new Status[statusMap.size()];
-            Iterator iter = statusMap.keySet().iterator();
+            Iterator<Integer> iter = statusMap.keySet().iterator();
             for (int i = 0; iter.hasNext(); i++) {
-                Integer statusKey = (Integer) iter.next();
-                sts[i] = new Status(statusKey.intValue());
+                Integer statusKey = iter.next();
+                sts[i] = new Status(statusKey);
             }
         } else {
             sts = new Status[] {status};
@@ -252,11 +251,9 @@
         response.appendChild(DomUtil.hrefToXml(getHref(), document));
         if (type == TYPE_PROPSTAT) {
             // add '<propstat>' elements
-            Iterator iter = statusMap.keySet().iterator();
-            while (iter.hasNext()) {
-                Integer statusKey = (Integer) iter.next();
-                Status st = new Status(statusKey.intValue());
-                PropContainer propCont = (PropContainer) statusMap.get(statusKey);
+            for (Integer statusKey : statusMap.keySet()) {
+                Status st = new Status(statusKey);
+                PropContainer propCont = statusMap.get(statusKey);
                 if (!propCont.isEmpty()) {
                     Element propstat = DomUtil.createElement(document, XML_PROPSTAT, NAMESPACE);
                     propstat.appendChild(propCont.toXml(document));
@@ -284,7 +281,7 @@
      *
      * @param property the property to add
      */
-    public void add(DavProperty property) {
+    public void add(DavProperty<?> property) {
         checkType(TYPE_PROPSTAT);
         PropContainer status200 = getPropContainer(DavServletResponse.SC_OK, false);
         status200.addContent(property);
@@ -307,7 +304,7 @@
      * @param property the property to add
      * @param status the status of the response set to select
      */
-    public void add(DavProperty property, int status) {
+    public void add(DavProperty<?> property, int status) {
         checkType(TYPE_PROPSTAT);
         PropContainer propCont = getPropContainer(status, false);
         propCont.addContent(property);
@@ -330,18 +327,14 @@
      * @return
      */
     private PropContainer getPropContainer(int status, boolean forNames) {
-        Integer statusKey = new Integer(status);
-        PropContainer propContainer;
-        Object entry = statusMap.get(statusKey);
-        if (entry == null) {
+        PropContainer propContainer = statusMap.get(status);
+        if (propContainer == null) {
             if (forNames) {
                 propContainer = new DavPropertyNameSet();
             } else {
                 propContainer = new DavPropertySet();
             }
-            statusMap.put(statusKey, propContainer);
-        } else {
-            propContainer = (PropContainer) entry;
+            statusMap.put(status, propContainer);
         }
         return propContainer;
     }
@@ -361,9 +354,8 @@
      * @return property set
      */
     public DavPropertySet getProperties(int status) {
-        Integer key = new Integer(status);
-        if (statusMap.containsKey(key)) {
-            Object mapEntry = statusMap.get(key);
+        if (statusMap.containsKey(status)) {
+            PropContainer mapEntry = statusMap.get(status);
             if (mapEntry != null && mapEntry instanceof DavPropertySet) {
                 return (DavPropertySet) mapEntry;
             }
@@ -380,19 +372,17 @@
      * @return property names
      */
     public DavPropertyNameSet getPropertyNames(int status) {
-        Integer key = new Integer(status);
-        if (statusMap.containsKey(key)) {
-            Object mapEntry = statusMap.get(key);
+        if (statusMap.containsKey(status)) {
+            PropContainer mapEntry = statusMap.get(status);
             if (mapEntry != null) {
                 if (mapEntry instanceof DavPropertySet) {
                     DavPropertyNameSet set = new DavPropertyNameSet();
-                    DavPropertyName[] names = ((DavPropertySet) mapEntry).getPropertyNames();
-                    for (int i = 0; i < names.length; i++) {
-                        set.add(names[i]);
+                    for (DavPropertyName name : ((DavPropertySet) mapEntry).getPropertyNames()) {
+                        set.add(name);
                     }
                     return set;
                 } else {
-                    // is alread a DavPropertyNameSet
+                    // is already a DavPropertyNameSet
                     return (DavPropertyNameSet) mapEntry;
                 }
             }
@@ -439,12 +429,12 @@
                         Element el = propIt.nextElement();
                         /*
                         always build dav property from the given element, since
-                        destinction between prop-names and properties not having
+                        distinction between prop-names and properties not having
                         a value is not possible.
                         retrieval of the set of 'property names' is possible from
                         the given prop-set by calling DavPropertySet#getPropertyNameSet()
                         */
-                        DavProperty property = DefaultDavProperty.createFromXml(el);
+                        DavProperty<?> property = DefaultDavProperty.createFromXml(el);
                         response.add(property, statusCode);
                     }
                 }

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/WebdavRequestImpl.java Tue Feb 23 13:27:10 2010
@@ -62,6 +62,7 @@
 import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
 import org.apache.jackrabbit.webdav.property.DavPropertySet;
 import org.apache.jackrabbit.webdav.property.DefaultDavProperty;
+import org.apache.jackrabbit.webdav.property.PropEntry;
 import org.apache.jackrabbit.webdav.transaction.TransactionConstants;
 import org.apache.jackrabbit.webdav.transaction.TransactionInfo;
 import org.apache.jackrabbit.webdav.version.LabelInfo;
@@ -94,8 +95,7 @@
     private int propfindType = PROPFIND_ALL_PROP;
     private DavPropertyNameSet propfindProps;
     private DavPropertySet proppatchSet;
-    private DavPropertyNameSet proppatchRemove;
-    private List proppatchList;
+    private List<PropEntry> proppatchList;
 
     /**
      * Creates a new <code>DavServletRequest</code> with the given parameters.
@@ -129,9 +129,9 @@
                 session.addLockToken(lt);
             }
             // add all token present in the the If header to the session as well.
-            Iterator it = ifHeader.getAllTokens();
+            Iterator<String> it = ifHeader.getAllTokens();
             while (it.hasNext()) {
-                String ifHeaderToken = (String) it.next();
+                String ifHeaderToken = it.next();
                 session.addLockToken(ifHeaderToken);
             }
         }
@@ -208,7 +208,7 @@
             if (ref.startsWith(contextPath)) {
                 ref = ref.substring(contextPath.length());
             } else {
-                //absolute path has to start with contextpath
+                //absolute path has to start with context path
                 throw new DavException(DavServletResponse.SC_FORBIDDEN);
             }
         }
@@ -281,7 +281,7 @@
     public Document getRequestDocument() throws DavException {
         Document requestDocument = null;
         /*
-        Don't attempt to parse the body if the contentlength header is 0.
+        Don't attempt to parse the body if the content length header is 0.
         NOTE: a value of -1 indicates that the length is unknown, thus we have
         to parse the body. Note that http1.1 request using chunked transfer
         coding will therefore not be detected here.
@@ -431,7 +431,7 @@
       * @return the list of change operations entries in the PROPPATCH request body
       * @see DavServletRequest#getPropPatchChangeList()
       */
-     public List getPropPatchChangeList() throws DavException {
+     public List<? extends PropEntry> getPropPatchChangeList() throws DavException {
          if (proppatchList == null) {
              parsePropPatchRequest();
          }
@@ -444,8 +444,7 @@
     private void parsePropPatchRequest() throws DavException {
 
         proppatchSet = new DavPropertySet();
-        proppatchRemove = new DavPropertyNameSet();
-        proppatchList = new ArrayList();
+        proppatchList = new ArrayList<PropEntry>();
 
         Document requestDocument = getRequestDocument();
 
@@ -467,7 +466,7 @@
                 if (propEl != null) {
                     ElementIterator properties = DomUtil.getChildren(propEl);
                     while (properties.hasNext()) {
-                        DavProperty davProp = DefaultDavProperty.createFromXml(properties.nextElement());
+                        DavProperty<?> davProp = DefaultDavProperty.createFromXml(properties.nextElement());
                         proppatchSet.add(davProp);
                         proppatchList.add(davProp);
                     }
@@ -477,7 +476,7 @@
                 if (propEl != null) {
                     ElementIterator properties = DomUtil.getChildren(propEl);
                     while (properties.hasNext()) {
-                        DavProperty davProp = DefaultDavProperty.createFromXml(properties.nextElement());
+                        DavProperty<?> davProp = DefaultDavProperty.createFromXml(properties.nextElement());
                         proppatchSet.add(davProp);
                         proppatchList.add(davProp.getName());
                     }
@@ -575,7 +574,7 @@
      * @return strong etag or empty string.
      */
     private String getStrongETag(DavResource resource) {
-        DavProperty prop = resource.getProperty(DavPropertyName.GETETAG);
+        DavProperty<?> prop = resource.getProperty(DavPropertyName.GETETAG);
         if (prop != null && prop.getValue() != null) {
             String etag = prop.getValue().toString();
             if (isStrongETag(etag)) {
@@ -816,11 +815,11 @@
         return httpRequest.getHeader(s);
     }
 
-    public Enumeration getHeaders(String s) {
+    public Enumeration<?> getHeaders(String s) {
         return httpRequest.getHeaders(s);
     }
 
-    public Enumeration getHeaderNames() {
+    public Enumeration<?> getHeaderNames() {
         return httpRequest.getHeaderNames();
     }
 
@@ -904,7 +903,7 @@
         return httpRequest.getAttribute(s);
     }
 
-    public Enumeration getAttributeNames() {
+    public Enumeration<?> getAttributeNames() {
         return httpRequest.getAttributeNames();
     }
 
@@ -932,7 +931,7 @@
         return httpRequest.getParameter(s);
     }
 
-    public Enumeration getParameterNames() {
+    public Enumeration<?> getParameterNames() {
         return httpRequest.getParameterNames();
     }
 
@@ -940,7 +939,7 @@
         return httpRequest.getParameterValues(s);
     }
 
-    public Map getParameterMap() {
+    public Map<?,?> getParameterMap() {
         return httpRequest.getParameterMap();
     }
 
@@ -984,7 +983,7 @@
         return httpRequest.getLocale();
     }
 
-    public Enumeration getLocales() {
+    public Enumeration<?> getLocales() {
         return httpRequest.getLocales();
     }
 

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/bind/BindableResource.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/bind/BindableResource.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/bind/BindableResource.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/bind/BindableResource.java Tue Feb 23 13:27:10 2010
@@ -32,7 +32,8 @@
     public void bind(DavResource collection, DavResource newBinding) throws DavException;
 
     /**
-     * Will rebind the resource to the given collection. By definition, this is an atomic move operation.
+     * Will rebind the resource to the given collection. By definition, this is
+     * an atomic move operation.
      *
      * @param collection the collection to create the new binding in.
      * @param newBinding the new binding
@@ -40,9 +41,10 @@
     public void rebind(DavResource collection, DavResource newBinding) throws DavException;
 
     /**
-     * Will retrieve a collection of parent elements of the bindable resource representing the parent set.
+     * Will retrieve a collection of parent elements of the bindable resource
+     * representing the parent set.
      *
      * @return newBinding the new binding
      */
-    public Set getParentElements();
+    public Set<ParentElement> getParentElements();
 }

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/bind/ParentSet.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/bind/ParentSet.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/bind/ParentSet.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/bind/ParentSet.java Tue Feb 23 13:27:10 2010
@@ -23,15 +23,15 @@
 /**
  * <code>ParentSet</code> represents a DAV:parent-set property.
  */
-public class ParentSet extends AbstractDavProperty {
+public class ParentSet extends AbstractDavProperty<Collection<ParentElement>> {
 
-    private final Collection parents;
+    private final Collection<ParentElement> parents;
 
     /**
      * Creates a new ParentSet from a collection of <code>ParentElement</code> objects.
      * @param parents
      */
-    public ParentSet(Collection parents) {
+    public ParentSet(Collection<ParentElement> parents) {
         super(BindConstants.PARENTSET, true);
         this.parents = parents;
     }
@@ -39,7 +39,7 @@
     /**
      * @see org.apache.jackrabbit.webdav.property.AbstractDavProperty#getValue() 
      */
-    public Object getValue() {
+    public Collection<ParentElement> getValue() {
         return this.parents;
     }
 }

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/AclMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/AclMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/AclMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/AclMethod.java Tue Feb 23 13:27:10 2010
@@ -41,6 +41,7 @@
      * @return DavMethods#METHOD_ACL
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_ACL;
     }
@@ -50,7 +51,8 @@
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_OK 200 (OK)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_OK;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/BaselineControlMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/BaselineControlMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/BaselineControlMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/BaselineControlMethod.java Tue Feb 23 13:27:10 2010
@@ -60,6 +60,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_BASELINE_CONTROL;
     }
@@ -69,7 +70,8 @@
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_OK 200 (OK)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_OK;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/BindMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/BindMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/BindMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/BindMethod.java Tue Feb 23 13:27:10 2010
@@ -35,6 +35,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return "BIND";
     }
@@ -43,8 +44,10 @@
     /**
      *
      * @param statusCode
-     * @return true if status code is 200 (existing binding was overwritten) or 201 (new binding created).
+     * @return true if status code is 200 (existing binding was overwritten) or
+     * 201 (new binding created).
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_CREATED || statusCode == DavServletResponse.SC_OK;
     }

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/CheckinMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/CheckinMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/CheckinMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/CheckinMethod.java Tue Feb 23 13:27:10 2010
@@ -42,6 +42,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_CHECKIN;
     }
@@ -52,7 +53,8 @@
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_CREATED 201 (Created)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_CREATED;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/CheckoutMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/CheckoutMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/CheckoutMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/CheckoutMethod.java Tue Feb 23 13:27:10 2010
@@ -37,6 +37,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_CHECKOUT;
     }
@@ -47,7 +48,8 @@
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_OK 200 (OK)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_OK;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/CopyMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/CopyMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/CopyMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/CopyMethod.java Tue Feb 23 13:27:10 2010
@@ -61,6 +61,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_COPY;
     }
@@ -72,7 +73,8 @@
      * @return true if status code is {@link DavServletResponse#SC_CREATED 201
      * (Created)} or {@link DavServletResponse#SC_NO_CONTENT 204 (No Content)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_CREATED || statusCode == DavServletResponse.SC_NO_CONTENT;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/DavMethodBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/DavMethodBase.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/DavMethodBase.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/DavMethodBase.java Tue Feb 23 13:27:10 2010
@@ -67,6 +67,7 @@
      * @return Name of the method.
      * @see HttpMethod#getName()
      */
+    @Override
     public abstract String getName();
 
     //----------------------------------------------------------< DavMethod >---
@@ -264,6 +265,7 @@
      * @param httpState
      * @param httpConnection
      */
+    @Override
     protected void processStatusLine(HttpState httpState, HttpConnection httpConnection) {
         super.processStatusLine(httpState, httpConnection);
         int code = getStatusCode();
@@ -280,6 +282,7 @@
      * @param httpConnection
      * @see HttpMethodBase#processResponseBody(HttpState, HttpConnection)
      */
+    @Override
     protected void processResponseBody(HttpState httpState, HttpConnection httpConnection) {
         // in case of multi-status response
         if (getStatusCode() == DavServletResponse.SC_MULTI_STATUS) {
@@ -293,4 +296,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/DeleteMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/DeleteMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/DeleteMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/DeleteMethod.java Tue Feb 23 13:27:10 2010
@@ -32,10 +32,12 @@
         super(uri);
     }
 
+    @Override
     public String getName() {
         return DavMethods.METHOD_DELETE;
     }
 
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_NO_CONTENT;
     }

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/LabelMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/LabelMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/LabelMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/LabelMethod.java Tue Feb 23 13:27:10 2010
@@ -72,6 +72,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_LABEL;
     }
@@ -82,7 +83,8 @@
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_OK 200 (OK)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_OK;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/LockMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/LockMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/LockMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/LockMethod.java Tue Feb 23 13:27:10 2010
@@ -146,6 +146,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_LOCK;
     }
@@ -155,6 +156,7 @@
      * @return true, if the status code indicates success and if the response
      * contains a Lock-Token header for a request used to create a new lock.
      */
+    @Override
     public boolean succeeded() {
         checkUsed();
         String lt = getLockToken();
@@ -167,6 +169,7 @@
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_OK 200 (OK)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_OK;
     }
@@ -184,6 +187,7 @@
      * @param httpConnection
      * @see HttpMethodBase#processResponseBody(HttpState, HttpConnection)
      */
+    @Override
     protected void processResponseBody(HttpState httpState, HttpConnection httpConnection) {
         // in case of successful response code -> parse xml body into lockDiscovery.
         if (getSuccess()) {
@@ -220,4 +224,4 @@
         }
         return false;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MergeMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MergeMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MergeMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MergeMethod.java Tue Feb 23 13:27:10 2010
@@ -40,6 +40,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_MERGE;
     }
@@ -50,8 +51,9 @@
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_MULTI_STATUS 207 (Multi-Status)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         // TODO: is this correct?
         return statusCode == DavServletResponse.SC_MULTI_STATUS;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MkActivityMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MkActivityMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MkActivityMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MkActivityMethod.java Tue Feb 23 13:27:10 2010
@@ -36,6 +36,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_MKACTIVITY;
     }
@@ -45,7 +46,8 @@
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_CREATED 201 (Created)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_CREATED;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MkColMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MkColMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MkColMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MkColMethod.java Tue Feb 23 13:27:10 2010
@@ -36,17 +36,18 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_MKCOL;
     }
 
     //------------------------------------------------------< DavMethodBase >---
     /**
-     *
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_CREATED 201 (Created)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_CREATED;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MkWorkspaceMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MkWorkspaceMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MkWorkspaceMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MkWorkspaceMethod.java Tue Feb 23 13:27:10 2010
@@ -36,17 +36,18 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_MKWORKSPACE;
     }
 
     //------------------------------------------------------< DavMethodBase >---
     /**
-     *
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_CREATED 201 (Created)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_CREATED;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MoveMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MoveMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MoveMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/MoveMethod.java Tue Feb 23 13:27:10 2010
@@ -40,6 +40,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_MOVE;
     }
@@ -51,7 +52,8 @@
      * @return true if status code is {@link DavServletResponse#SC_CREATED 201
      * (Created)} or {@link DavServletResponse#SC_NO_CONTENT 204 (No Content)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_CREATED || statusCode == DavServletResponse.SC_NO_CONTENT;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/OptionsMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/OptionsMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/OptionsMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/OptionsMethod.java Tue Feb 23 13:27:10 2010
@@ -39,8 +39,8 @@
 
     private static Logger log = LoggerFactory.getLogger(OptionsMethod.class);
 
-    private final Set allowedMethods = new HashSet();
-    private final Set complianceClasses = new HashSet();
+    private final Set<String> allowedMethods = new HashSet<String>();
+    private final Set<String> complianceClasses = new HashSet<String>();
 
     public OptionsMethod(String uri) {
 	super(uri);
@@ -90,7 +90,7 @@
      */
     public String[] getAllowedMethods() {
         checkUsed();
-        return (String[]) allowedMethods.toArray(new String[allowedMethods.size()]);
+        return allowedMethods.toArray(new String[allowedMethods.size()]);
     }
 
     /**
@@ -113,13 +113,14 @@
      */
     public String[] getComplianceClasses() {
         checkUsed();
-        return (String[]) complianceClasses.toArray(new String[complianceClasses.size()]);
+        return complianceClasses.toArray(new String[complianceClasses.size()]);
     }
 
     //---------------------------------------------------------< HttpMethod >---
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_OPTIONS;
     }
@@ -137,19 +138,18 @@
      *        this HTTP method
      * @see HttpMethodBase#processResponseHeaders(HttpState, HttpConnection)
      */
+    @Override
     protected void processResponseHeaders(HttpState state, HttpConnection conn) {
         Header allow = getResponseHeader("Allow");
         if (allow != null) {
-            String[] methods = allow.getValue().split(",");
-            for (int i = 0; i < methods.length; i++) {
-                allowedMethods.add(methods[i].trim().toUpperCase());
+            for (String method : allow.getValue().split(",")) {
+                allowedMethods.add(method.trim().toUpperCase());
             }
         }
         Header dav = getResponseHeader("DAV");
         if (dav != null) {
-            String[] classes = dav.getValue().split(",");
-            for (int i = 0; i < classes.length; i++) {
-                complianceClasses.add(classes[i].trim());
+            for (String cl : dav.getValue().split(",")) {
+                complianceClasses.add(cl.trim());
             }
         }
     }
@@ -160,7 +160,8 @@
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_OK 200 (OK)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_OK;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/OrderPatchMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/OrderPatchMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/OrderPatchMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/OrderPatchMethod.java Tue Feb 23 13:27:10 2010
@@ -90,6 +90,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_ORDERPATCH;
     }
@@ -100,7 +101,8 @@
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_OK 200 (OK)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_OK;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PollMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PollMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PollMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PollMethod.java Tue Feb 23 13:27:10 2010
@@ -69,11 +69,13 @@
         }
     }
     //---------------------------------------------------------< HttpMethod >---
+    @Override
     public String getName() {
         return DavMethods.METHOD_POLL;
     }
 
     //------------------------------------------------------< DavMethodBase >---
+    @Override
     protected boolean isSuccess(int statusCode) {
         return DavServletResponse.SC_OK == statusCode;
     }
@@ -91,6 +93,7 @@
       * @param httpConnection
       * @see HttpMethodBase#processResponseBody(HttpState, HttpConnection)
       */
+     @Override
      protected void processResponseBody(HttpState httpState, HttpConnection httpConnection) {
          // in case of successful response code -> parse xml body discovery object
          if (getSuccess()) {
@@ -128,4 +131,4 @@
          }
          return false;
      }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropFindMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropFindMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropFindMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropFindMethod.java Tue Feb 23 13:27:10 2010
@@ -133,16 +133,17 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_PROPFIND;
     }
 
     //------------------------------------------------------< DavMethodBase >---
     /**
-     *
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_MULTI_STATUS 207 (Multi-Status)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_MULTI_STATUS;
     }

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropPatchMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropPatchMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropPatchMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PropPatchMethod.java Tue Feb 23 13:27:10 2010
@@ -23,6 +23,7 @@
 import org.apache.jackrabbit.webdav.property.DavPropertyName;
 import org.apache.jackrabbit.webdav.property.DavPropertyNameIterator;
 import org.apache.jackrabbit.webdav.property.DavProperty;
+import org.apache.jackrabbit.webdav.property.PropEntry;
 import org.apache.jackrabbit.webdav.DavServletResponse;
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.MultiStatusResponse;
@@ -39,7 +40,6 @@
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
 import java.util.List;
-import java.util.Iterator;
 
 /**
  * <code>PropPatchMethod</code>...
@@ -59,7 +59,7 @@
      * (for 'remove') entries.
      * @throws IOException
      */
-    public PropPatchMethod(String uri, List changeList) throws IOException {
+    public PropPatchMethod(String uri, List<? extends PropEntry> changeList) throws IOException {
         super(uri);
         if (changeList == null || changeList.isEmpty()) {
             throw new IllegalArgumentException("PROPPATCH cannot be executed without properties to be set or removed.");
@@ -70,12 +70,10 @@
 
             Element propElement = null;
             boolean isSet = false;
-            Iterator it = changeList.iterator();
-            while (it.hasNext()) {
-                Object entry = it.next();
+            for (Object entry : changeList) {
                 if (entry instanceof DavPropertyName) {
                     // DAV:remove
-                    DavPropertyName removeName = (DavPropertyName)entry;
+                    DavPropertyName removeName = (DavPropertyName) entry;
                     if (propElement == null || isSet) {
                         isSet = false;
                         propElement = getPropElement(propUpdateElement, isSet);
@@ -84,7 +82,7 @@
                     propertyNames.add(removeName);
                 } else if (entry instanceof DavProperty) {
                     // DAV:set
-                    DavProperty setProperty = (DavProperty)entry;
+                    DavProperty<?> setProperty = (DavProperty<?>) entry;
                     if (propElement == null || !isSet) {
                         isSet = true;
                         propElement = getPropElement(propUpdateElement, isSet);
@@ -112,9 +110,8 @@
         }
 
         propertyNames.addAll(removeProperties);
-        DavPropertyName[] setNames = setProperties.getPropertyNames();
-        for (int i = 0; i < setNames.length; i++) {
-            propertyNames.add(setNames[i]);
+        for (DavPropertyName setName : setProperties.getPropertyNames()) {
+            propertyNames.add(setName);
         }
 
         try {
@@ -145,6 +142,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_PROPPATCH;
     }
@@ -157,6 +155,7 @@
      * For compliance reason {@link DavServletResponse#SC_OK 200 (OK)} is
      * interpreted as successful response as well.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_MULTI_STATUS || statusCode == DavServletResponse.SC_OK;
     }
@@ -167,6 +166,7 @@
      * @param httpState
      * @param httpConnection
      */
+    @Override
     protected void processMultiStatusBody(MultiStatus multiStatus, HttpState httpState, HttpConnection httpConnection) {
         // check of OK response contains all set/remove properties
         MultiStatusResponse[] resp = multiStatus.getResponses();
@@ -218,6 +218,7 @@
      * @throws IOException
      * @see DavMethod#getResponseException()
      */
+    @Override
     public DavException getResponseException() throws IOException {
         checkUsed();
         if (getSuccess()) {
@@ -231,4 +232,4 @@
             return super.getResponseException();
         }
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PutMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PutMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PutMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/PutMethod.java Tue Feb 23 13:27:10 2010
@@ -36,6 +36,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_PUT;
     }
@@ -47,7 +48,8 @@
      * or {@link DavServletResponse#SC_NO_CONTENT 204 (No Content)}.
      * @see DavMethodBase#isSuccess(int)
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_CREATED || statusCode == DavServletResponse.SC_NO_CONTENT;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/RebindMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/RebindMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/RebindMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/RebindMethod.java Tue Feb 23 13:27:10 2010
@@ -35,16 +35,18 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return "REBIND";
     }
 
     //------------------------------------------------------< DavMethodBase >---
     /**
-     *
      * @param statusCode
-     * @return true if status code is 200 (existing binding was overwritten) or 201 (new binding created).
+     * @return true if status code is 200 (existing binding was overwritten) or
+     * 201 (new binding created).
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_CREATED || statusCode == DavServletResponse.SC_OK;
     }

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/ReportMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/ReportMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/ReportMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/ReportMethod.java Tue Feb 23 13:27:10 2010
@@ -48,6 +48,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
 	return DavMethods.METHOD_REPORT;
     }
@@ -61,6 +62,7 @@
      * report request included a depth other than {@link DavConstants#DEPTH_0 0}
      * a multi status response is required.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         if (isDeep) {
             return statusCode == DavServletResponse.SC_MULTI_STATUS;
@@ -68,4 +70,4 @@
             return statusCode == DavServletResponse.SC_OK || statusCode == DavServletResponse.SC_MULTI_STATUS;
         }
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/SearchMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/SearchMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/SearchMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/SearchMethod.java Tue Feb 23 13:27:10 2010
@@ -54,6 +54,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_SEARCH;
     }
@@ -64,7 +65,8 @@
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_MULTI_STATUS 207 (Multi-Status)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_MULTI_STATUS;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/SubscribeMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/SubscribeMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/SubscribeMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/SubscribeMethod.java Tue Feb 23 13:27:10 2010
@@ -118,11 +118,13 @@
     }
 
     //---------------------------------------------------------< HttpMethod >---
+    @Override
     public String getName() {
         return DavMethods.METHOD_SUBSCRIBE;
     }
 
     //------------------------------------------------------< DavMethodBase >---
+    @Override
     protected boolean isSuccess(int statusCode) {
         return DavServletResponse.SC_OK == statusCode;
     }
@@ -140,6 +142,7 @@
      * @param httpConnection
      * @see HttpMethodBase#processResponseBody(HttpState, HttpConnection)
      */
+    @Override
     protected void processResponseBody(HttpState httpState, HttpConnection httpConnection) {
         // in case of successful response code -> parse xml body discovery object
         if (getSuccess()) {
@@ -175,4 +178,4 @@
         }
         return false;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnLockMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnLockMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnLockMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnLockMethod.java Tue Feb 23 13:27:10 2010
@@ -42,6 +42,7 @@
     /**
      * @see HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_UNLOCK;
     }
@@ -53,7 +54,8 @@
      * {@link DavServletResponse#SC_NO_CONTENT 204 (No Content)}.
      * @see DavMethodBase#isSuccess(int)
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_NO_CONTENT;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnSubscribeMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnSubscribeMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnSubscribeMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnSubscribeMethod.java Tue Feb 23 13:27:10 2010
@@ -34,12 +34,14 @@
     }
 
     //---------------------------------------------------------< HttpMethod >---
+    @Override
     public String getName() {
         return DavMethods.METHOD_UNSUBSCRIBE;
     }
 
     //------------------------------------------------------< DavMethodBase >---
+    @Override
     protected boolean isSuccess(int statusCode) {
         return DavServletResponse.SC_NO_CONTENT == statusCode;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnbindMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnbindMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnbindMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UnbindMethod.java Tue Feb 23 13:27:10 2010
@@ -35,6 +35,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return "UNBIND";
     }
@@ -45,6 +46,7 @@
      * @param statusCode
      * @return true if status code is 200 (binding was removed).
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_OK;
     }

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UncheckoutMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UncheckoutMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UncheckoutMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UncheckoutMethod.java Tue Feb 23 13:27:10 2010
@@ -36,6 +36,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_UNCHECKOUT;
     }
@@ -47,7 +48,8 @@
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_OK 200 (OK)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_OK;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UpdateMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UpdateMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UpdateMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/UpdateMethod.java Tue Feb 23 13:27:10 2010
@@ -40,6 +40,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_UPDATE;
     }
@@ -50,7 +51,8 @@
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_MULTI_STATUS 207 (Multi-Status)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_MULTI_STATUS;
     }
-}
\ No newline at end of file
+}

Modified: jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/VersionControlMethod.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/VersionControlMethod.java?rev=915333&r1=915332&r2=915333&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/VersionControlMethod.java (original)
+++ jackrabbit/trunk/jackrabbit-webdav/src/main/java/org/apache/jackrabbit/webdav/client/methods/VersionControlMethod.java Tue Feb 23 13:27:10 2010
@@ -36,6 +36,7 @@
     /**
      * @see org.apache.commons.httpclient.HttpMethod#getName()
      */
+    @Override
     public String getName() {
         return DavMethods.METHOD_VERSION_CONTROL;
     }
@@ -46,7 +47,8 @@
      * @param statusCode
      * @return true if status code is {@link DavServletResponse#SC_OK 200 (OK)}.
      */
+    @Override
     protected boolean isSuccess(int statusCode) {
         return statusCode == DavServletResponse.SC_OK;
     }
-}
\ No newline at end of file
+}



Mime
View raw message