Removed the 'canLock' and 'canRemoveLock' methods from the resources

OpenMarshal · May 31, 2017 · 3902d35 · 3902d35
1 parent c6868fa
commit 3902d35
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 67 deletions.
diff --git a/lib/resource/IResource.d.ts b/lib/resource/IResource.d.ts
@@ -36,9 +36,7 @@ export interface IResource {
     getLocks(callback: ReturnCallback<Lock[]>): any;
     setLock(lock: Lock, callback: SimpleCallback): any;
     removeLock(uuid: string, callback: ReturnCallback<boolean>): any;
-    canLock(lockKind: LockKind, callback: ReturnCallback<boolean>): any;
     getAvailableLocks(callback: ReturnCallback<LockKind[]>): any;
-    canRemoveLock(uuid: string, callback: ReturnCallback<boolean>): any;
     getLock(uuid: string, callback: ReturnCallback<Lock>): any;
     addChild(resource: IResource, callback: SimpleCallback): any;
     removeChild(resource: IResource, callback: SimpleCallback): any;

diff --git a/lib/resource/lock/LockBag.d.ts b/lib/resource/lock/LockBag.d.ts
@@ -8,7 +8,6 @@ export declare class LockBag {
     getLock(uuid: string): Lock;
     setLock(lock: Lock): boolean;
     removeLock(uuid: string): void;
-    canRemoveLock(uuid: string): boolean;
     canLock(lockKind: LockKind): boolean;
     private notExpired(l);
     private cleanLocks();

diff --git a/lib/resource/lock/LockBag.js b/lib/resource/lock/LockBag.js
@@ -30,10 +30,6 @@ var LockBag = (function () {
         var _this = this;
         this.locks = this.locks.filter(function (l) { return _this.notExpired(l) && l.uuid !== uuid; });
     };
-    LockBag.prototype.canRemoveLock = function (uuid) {
-        this.cleanLocks();
-        return this.locks.some(function (l) { return l.uuid === uuid; });
-    };
     LockBag.prototype.canLock = function (lockKind) {
         this.cleanLocks();
         return !(lockKind.scope.isSame(LockScope_1.LockScope.Exclusive) && this.locks.length > 0) && !this.locks.some(function (l) { return l.lockKind.scope.isSame(LockScope_1.LockScope.Exclusive); });

diff --git a/lib/resource/std/StandardResource.d.ts b/lib/resource/std/StandardResource.d.ts
@@ -20,8 +20,6 @@ export declare abstract class StandardResource implements IResource {
     getLocks(callback: ReturnCallback<Lock[]>): void;
     setLock(lock: Lock, callback: SimpleCallback): void;
     removeLock(uuid: string, callback: ReturnCallback<boolean>): void;
-    canRemoveLock(uuid: string, callback: ReturnCallback<boolean>): void;
-    canLock(lockKind: LockKind, callback: ReturnCallback<boolean>): void;
     getLock(uuid: string, callback: ReturnCallback<Lock>): void;
     setProperty(name: string, value: ResourcePropertyValue, callback: SimpleCallback): void;
     getProperty(name: string, callback: ReturnCallback<ResourcePropertyValue>): void;

diff --git a/lib/resource/std/StandardResource.js b/lib/resource/std/StandardResource.js
@@ -67,12 +67,6 @@ var StandardResource = (function () {
         this.updateLastModified();
         callback(null, true);
     };
-    StandardResource.prototype.canRemoveLock = function (uuid, callback) {
-        callback(null, this.lockBag.canRemoveLock(uuid));
-    };
-    StandardResource.prototype.canLock = function (lockKind, callback) {
-        callback(null, this.lockBag.canLock(lockKind));
-    };
     StandardResource.prototype.getLock = function (uuid, callback) {
         callback(null, this.lockBag.getLock(uuid));
     };

diff --git a/src/resource/IResource.ts b/src/resource/IResource.ts
@@ -57,9 +57,7 @@ export interface IResource
     getLocks(callback : ReturnCallback<Lock[]>)
     setLock(lock : Lock, callback : SimpleCallback)
     removeLock(uuid : string, callback : ReturnCallback<boolean>)
-    canLock(lockKind : LockKind, callback : ReturnCallback<boolean>)
     getAvailableLocks(callback : ReturnCallback<LockKind[]>)
-    canRemoveLock(uuid : string, callback : ReturnCallback<boolean>)
     getLock(uuid : string, callback : ReturnCallback<Lock>)
 
     // ****************************** Children ****************************** //

diff --git a/src/resource/lock/LockBag.ts b/src/resource/lock/LockBag.ts
@@ -42,11 +42,6 @@ export class LockBag
     {
         this.locks = this.locks.filter((l) => this.notExpired(l) && l.uuid !== uuid);
     }
-    canRemoveLock(uuid : string) : boolean
-    {
-        this.cleanLocks();
-        return this.locks.some((l) => l.uuid === uuid);
-    }
 
     canLock(lockKind : LockKind) : boolean
     {

diff --git a/src/resource/std/StandardResource.ts b/src/resource/std/StandardResource.ts
@@ -98,51 +98,6 @@ export abstract class StandardResource implements IResource
         this.lockBag.removeLock(uuid);
         this.updateLastModified();
         callback(null, true);
-        /*
-        this.getChildren((e, children) => {
-            if(e)
-            {
-                callback(e, false);
-                return;
-            }
-
-            let nb = children.length + 1;
-            children.forEach((child) => {
-                child.canRemoveLock(uuid, go);
-            });
-            go(null, true);
-
-            function go(e, can)
-            {
-                if(e)
-                {
-                    nb = -1;
-                    callback(e, false);
-                    return;
-                }
-                if(!can)
-                {
-                    nb = -1;
-                    callback(null, false);
-                    return;
-                }
-                --nb;
-                if(nb === 0)
-                {
-                    this.lockBag.removeLock(uuid);
-                    this.updateLastModified();
-                    callback(null, true);
-                }
-            }
-        })*/
-    }
-    canRemoveLock(uuid : string, callback : ReturnCallback<boolean>)
-    {
-        callback(null, this.lockBag.canRemoveLock(uuid));
-    }
-    canLock(lockKind : LockKind, callback : ReturnCallback<boolean>)
-    {
-        callback(null, this.lockBag.canLock(lockKind));
     }
     getLock(uuid : string, callback : ReturnCallback<Lock>)
     {