cmailleux 2005/08/04 12:34:19 CEST
Modified files:
core/src/java/org/jahia/services/webdav DAVFileAccess.java
Log:
local implementation of equals and hashcode only check on value of getPath
Revision Changes Path
1.19 +23 -14
jahia/core/src/java/org/jahia/services/webdav/DAVFileAccess.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/webdav/DAVFileAccess.java.diff?r1=1.18&r2=1.19&f=h
Index: DAVFileAccess.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/webdav/DAVFileAccess.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DAVFileAccess.java 7 Jul 2005 13:18:44 -0000 1.18
+++ DAVFileAccess.java 4 Aug 2005 10:34:19 -0000 1.19
@@ -1,14 +1,16 @@
package org.jahia.services.webdav;
+import org.apache.commons.httpclient.Cookie;
+import org.apache.commons.httpclient.HttpURL;
import org.apache.log4j.Logger;
import org.apache.slide.authenticate.CredentialsToken;
import org.apache.slide.authenticate.SecurityToken;
import org.apache.slide.common.*;
import org.apache.slide.content.*;
+import org.apache.slide.event.VetoException;
import org.apache.slide.lock.Lock;
import org.apache.slide.lock.NodeLock;
import org.apache.slide.lock.ObjectIsAlreadyLockedException;
-import org.apache.slide.lock.ObjectLockedException;
import org.apache.slide.macro.DeleteMacroException;
import org.apache.slide.macro.Macro;
import org.apache.slide.macro.MacroException;
@@ -16,42 +18,34 @@
import org.apache.slide.security.NodePermission;
import org.apache.slide.security.Security;
import org.apache.slide.structure.*;
-import org.apache.slide.webdav.WebdavException;
-import org.apache.slide.webdav.util.WebdavUtils;
import org.apache.slide.webdav.util.DeltavConstants;
import org.apache.slide.webdav.util.VersioningHelper;
-import org.apache.slide.event.VetoException;
-import org.apache.webdav.lib.util.WebdavStatus;
+import org.apache.slide.webdav.util.WebdavUtils;
import org.apache.webdav.lib.WebdavResource;
-import org.apache.commons.httpclient.HttpURL;
-import org.apache.commons.httpclient.Cookie;
-
+import org.jahia.bin.Jahia;
+import org.jahia.data.containers.JahiaContainer;
import org.jahia.data.fields.JahiaField;
import org.jahia.data.files.JahiaFile;
import org.jahia.data.files.JahiaFileField;
-import org.jahia.data.containers.JahiaContainer;
-import org.jahia.data.containers.JahiaContainerList;
import org.jahia.exceptions.JahiaException;
import org.jahia.params.ProcessingContext;
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.acl.JahiaACLException;
import org.jahia.services.acl.JahiaBaseACL;
+import org.jahia.services.containers.ContentContainerList;
import org.jahia.services.pages.ContentPage;
import org.jahia.services.sites.JahiaSite;
import org.jahia.services.usermanager.JahiaGroup;
import org.jahia.services.usermanager.JahiaGroupManagerService;
import org.jahia.services.usermanager.JahiaUser;
import org.jahia.services.usermanager.JahiaUserManagerService;
-import org.jahia.services.containers.ContentContainerList;
import org.jahia.urls.URI;
-import org.jahia.bin.Jahia;
-import javax.transaction.SystemException;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.FileNotFoundException;
+import java.io.InputStream;
import java.security.Principal;
import java.util.*;
@@ -1049,4 +1043,19 @@
newFile.getSessionInstance(newFileHttpURL).getState().addCookie(new
Cookie(newFileHttpURL.getHost(), "JSESSIONID", id, "/jahia", -1, false));
return newFile;
}
+
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof DAVFileAccess)) return false;
+
+ final DAVFileAccess davFileAccess = (DAVFileAccess) o;
+
+ if (getPath() != null ? !getPath().equals(davFileAccess.getPath()) :
davFileAccess.getPath() != null) return false;
+
+ return true;
+ }
+
+ public int hashCode() {
+ return (getPath() != null ? getPath().hashCode() : 0);
+ }
}
