Revision fa5600f7 web_client/src/gr/grnet/pithos/web/client/foldertree/Folder.java
b/web_client/src/gr/grnet/pithos/web/client/foldertree/Folder.java | ||
---|---|---|
191 | 191 |
public boolean equals(Object other) { |
192 | 192 |
if (other instanceof Folder) { |
193 | 193 |
Folder o = (Folder) other; |
194 |
if (container != null) |
|
195 |
return prefix.equals(o.getPrefix()) && container.equals(o.getContainer()); |
|
196 |
else |
|
197 |
return o.getContainer() == null && name.equals(o.getName()); |
|
194 |
return (container + prefix).equals(o.getContainer() + o.getPrefix()); |
|
198 | 195 |
} |
199 | 196 |
return false; |
200 | 197 |
} |
201 | 198 |
|
202 | 199 |
@Override |
203 | 200 |
public int hashCode() { |
204 |
return prefix.hashCode() + name.hashCode();
|
|
201 |
return (container + prefix).hashCode();
|
|
205 | 202 |
} |
206 | 203 |
|
207 | 204 |
public Set<File> getFiles() { |
Also available in: Unified diff