Removed the 'setName' parameter of the 'StandardResource.standardMove…

…To(...)' static method to use instead the 'IResource.rename(...)' method
OpenMarshal · Jun 15, 2017 · c3f8b6a · c3f8b6a
1 parent 695a93a
commit c3f8b6a
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 15 deletions.
diff --git a/lib/resource/physical/PhysicalResource.js b/lib/resource/physical/PhysicalResource.js
@@ -29,8 +29,7 @@ var PhysicalResource = (function (_super) {
         return _this;
     }
     PhysicalResource.prototype.moveTo = function (parent, newName, overwrite, callback) {
-        var _this = this;
-        StandardResource_1.StandardResource.standardMoveTo(this, parent, newName, overwrite, function (name) { return _this.name = name; }, callback);
+        StandardResource_1.StandardResource.standardMoveTo(this, parent, newName, overwrite, callback);
     };
     PhysicalResource.prototype.rename = function (newName, callback) {
         var _this = this;

diff --git a/lib/resource/std/StandardResource.d.ts b/lib/resource/std/StandardResource.d.ts
@@ -41,6 +41,6 @@ export declare abstract class StandardResource implements IResource {
     protected updateLastModified(): void;
     protected removeFromParent(callback: SimpleCallback): void;
     static standardRemoveFromParent(resource: IResource, callback: SimpleCallback): void;
-    static standardMoveTo(resource: IResource, parent: IResource, newName: string, overwrite: boolean, setName: (name: string) => void, callback: SimpleCallback): void;
+    static standardMoveTo(resource: IResource, parent: IResource, newName: string, overwrite: boolean, callback: SimpleCallback): void;
     static standardMimeType(resource: IResource, targetSource: boolean, callback: ReturnCallback<string>): void;
 }
diff --git a/lib/resource/std/StandardResource.js b/lib/resource/std/StandardResource.js
@@ -99,7 +99,7 @@ var StandardResource = (function () {
         else
             callback(null);
     };
-    StandardResource.standardMoveTo = function (resource, parent, newName, overwrite, setName, callback) {
+    StandardResource.standardMoveTo = function (resource, parent, newName, overwrite, callback) {
         parent.getChildren(function (e, children) {
             new Workflow_1.Workflow()
                 .each(children, function (child, cb) { return child.webName(function (e, name) {
@@ -130,9 +130,13 @@ var StandardResource = (function () {
                             callback(e);
                         }
                         else {
-                            setName(newName);
-                            parent.addChild(resource, function (e) {
-                                callback(e);
+                            resource.rename(newName, function (e, oldName, newName) {
+                                if (e)
+                                    callback(e);
+                                else
+                                    parent.addChild(resource, function (e) {
+                                        callback(e);
+                                    });
                             });
                         }
                     });

diff --git a/lib/resource/virtual/VirtualResource.js b/lib/resource/virtual/VirtualResource.js
@@ -32,8 +32,7 @@ var VirtualResource = (function (_super) {
         this.removeFromParent(callback);
     };
     VirtualResource.prototype.moveTo = function (parent, newName, overwrite, callback) {
-        var _this = this;
-        StandardResource_1.StandardResource.standardMoveTo(this, parent, newName, overwrite, function (name) { return _this.name = name; }, callback);
+        StandardResource_1.StandardResource.standardMoveTo(this, parent, newName, overwrite, callback);
     };
     VirtualResource.prototype.rename = function (newName, callback) {
         var oldName = this.name;

diff --git a/src/resource/physical/PhysicalResource.ts b/src/resource/physical/PhysicalResource.ts
@@ -30,7 +30,7 @@ export abstract class PhysicalResource extends StandardResource
     abstract delete(callback : SimpleCallback)
     moveTo(parent : IResource, newName : string, overwrite : boolean, callback : SimpleCallback)
     {
-        StandardResource.standardMoveTo(this, parent, newName, overwrite, (name) => this.name = name, callback);
+        StandardResource.standardMoveTo(this, parent, newName, overwrite, callback);
     }
     rename(newName : string, callback : Return2Callback<string, string>)
     {

diff --git a/src/resource/std/StandardResource.ts b/src/resource/std/StandardResource.ts
@@ -159,7 +159,7 @@ export abstract class StandardResource implements IResource
         else
             callback(null);
     }
-    public static standardMoveTo(resource : IResource, parent : IResource, newName : string, overwrite : boolean, setName : (name : string) => void, callback : SimpleCallback)
+    public static standardMoveTo(resource : IResource, parent : IResource, newName : string, overwrite : boolean, callback : SimpleCallback)
     {
         parent.getChildren((e, children) => {
             new Workflow()
@@ -196,9 +196,13 @@ export abstract class StandardResource implements IResource
                                 }
                                 else
                                 {
-                                    setName(newName);
-                                    parent.addChild(resource, (e) => {
-                                        callback(e);
+                                    resource.rename(newName, (e, oldName, newName) => {
+                                        if(e)
+                                            callback(e);
+                                        else
+                                            parent.addChild(resource, (e) => {
+                                                callback(e);
+                                            })
                                     })
                                 }
                             })

diff --git a/src/resource/virtual/VirtualResource.ts b/src/resource/virtual/VirtualResource.ts
@@ -32,7 +32,7 @@ export abstract class VirtualResource extends StandardResource
     }
     moveTo(parent : IResource, newName : string, overwrite : boolean, callback : SimpleCallback)
     {
-        StandardResource.standardMoveTo(this, parent, newName, overwrite, (name) => this.name = name, callback);
+        StandardResource.standardMoveTo(this, parent, newName, overwrite, callback);
     }
     rename(newName : string, callback : Return2Callback<string, string>)
     {