1 files changed, 45 insertions, 18 deletions
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWOLockManager.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWOLockManager.java
index 437445d636..23d9519481 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWOLockManager.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/concurrent/RWOLockManager.java
@@ -482,8 +482,7 @@ public class RWOLockManager<OBJECT, CONTEXT> extends Lifecycle implements IRWOLo
       return lockedObject;
     }
 
-    public boolean hasLock(org.eclipse.net4j.util.concurrent.IRWLockManager.LockType type, CONTEXT view,
-        boolean byOthers)
+    public boolean hasLock(LockType type, CONTEXT view, boolean byOthers)
     {
       CheckUtil.checkArg(view, "view");
 
@@ -517,7 +516,7 @@ public class RWOLockManager<OBJECT, CONTEXT> extends Lifecycle implements IRWOLo
       return false;
     }
 
-    public boolean hasLock(org.eclipse.net4j.util.concurrent.IRWLockManager.LockType type)
+    public boolean hasLock(LockType type)
     {
       switch (type)
       {
@@ -534,6 +533,49 @@ public class RWOLockManager<OBJECT, CONTEXT> extends Lifecycle implements IRWOLo
       return false;
     }
 
+    public Set<CONTEXT> getReadLockOwners()
+    {
+      return Collections.unmodifiableSet(readLockOwners);
+    }
+
+    public CONTEXT getWriteLockOwner()
+    {
+      return writeLockOwner;
+    }
+
+    public CONTEXT getWriteOptionOwner()
+    {
+      return writeOptionOwner;
+    }
+
+    @Override
+    public int hashCode()
+    {
+      return lockedObject.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+      if (this == obj)
+      {
+        return true;
+      }
+
+      if (obj == null)
+      {
+        return false;
+      }
+
+      if (!(obj instanceof LockState))
+      {
+        return false;
+      }
+
+      LockState<?, ?> other = (LockState<?, ?>)obj;
+      return lockedObject.equals(other.lockedObject);
+    }
+
     @Override
     public String toString()
     {
@@ -808,20 +850,5 @@ public class RWOLockManager<OBJECT, CONTEXT> extends Lifecycle implements IRWOLo
     {
       writeOptionOwner = null;
     }
-
-    public Set<CONTEXT> getReadLockOwners()
-    {
-      return Collections.unmodifiableSet(readLockOwners);
-    }
-
-    public CONTEXT getWriteLockOwner()
-    {
-      return writeLockOwner;
-    }
-
-    public CONTEXT getWriteOptionOwner()
-    {
-      return writeOptionOwner;
-    }
   }
 }