Changed the 'override' word into 'overwrite' which makes more sense

OpenMarshal · May 22, 2017 · f3caaab · f3caaab
1 parent 7ff9fd9
commit f3caaab
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 17 deletions.
diff --git a/lib/resource/IResource.d.ts b/lib/resource/IResource.d.ts
@@ -23,7 +23,7 @@ export interface IResource {
     fsManager: FSManager;
     create(callback: SimpleCallback): any;
     delete(callback: SimpleCallback): any;
-    moveTo(parent: IResource, newName: string, override: boolean, callback: SimpleCallback): any;
+    moveTo(parent: IResource, newName: string, overwrite: boolean, callback: SimpleCallback): any;
     rename(newName: string, callback: Return2Callback<string, string>): any;
     isSame(resource: IResource, callback: ReturnCallback<boolean>): any;
     isOnTheSameFSWith(resource: IResource, callback: ReturnCallback<boolean>): any;

diff --git a/lib/resource/physical/PhysicalResource.d.ts b/lib/resource/physical/PhysicalResource.d.ts
@@ -7,7 +7,7 @@ export declare abstract class PhysicalResource extends StandardResource {
     constructor(realPath: string, parent?: IResource, fsManager?: FSManager);
     abstract create(callback: SimpleCallback): any;
     abstract delete(callback: SimpleCallback): any;
-    moveTo(parent: IResource, newName: string, override: boolean, callback: SimpleCallback): void;
+    moveTo(parent: IResource, newName: string, overwrite: boolean, callback: SimpleCallback): void;
     rename(newName: string, callback: Return2Callback<string, string>): void;
     webName(callback: ReturnCallback<string>): void;
     abstract type(callback: ReturnCallback<ResourceType>): any;

diff --git a/lib/resource/physical/PhysicalResource.js b/lib/resource/physical/PhysicalResource.js
@@ -28,7 +28,7 @@ var PhysicalResource = (function (_super) {
         _this.name = path.basename(_this.realPath);
         return _this;
     }
-    PhysicalResource.prototype.moveTo = function (parent, newName, override, callback) {
+    PhysicalResource.prototype.moveTo = function (parent, newName, overwrite, callback) {
         var _this = this;
         if (parent === this.parent) {
             this.rename(newName, function (e, oldName, newName) {

diff --git a/lib/resource/std/RootResource.d.ts b/lib/resource/std/RootResource.d.ts
@@ -6,7 +6,7 @@ export declare class RootResource extends StandardResource {
     constructor();
     create(callback: SimpleCallback): void;
     delete(callback: SimpleCallback): void;
-    moveTo(parent: IResource, newName: string, override: boolean, callback: SimpleCallback): void;
+    moveTo(parent: IResource, newName: string, overwrite: boolean, callback: SimpleCallback): void;
     rename(newName: string, callback: Return2Callback<string, string>): void;
     webName(callback: ReturnCallback<string>): void;
     type(callback: ReturnCallback<ResourceType>): void;

diff --git a/lib/resource/std/RootResource.js b/lib/resource/std/RootResource.js
@@ -28,7 +28,7 @@ var RootResource = (function (_super) {
     RootResource.prototype.delete = function (callback) {
         callback(Errors_1.Errors.InvalidOperation);
     };
-    RootResource.prototype.moveTo = function (parent, newName, override, callback) {
+    RootResource.prototype.moveTo = function (parent, newName, overwrite, callback) {
         callback(Errors_1.Errors.InvalidOperation);
     };
     RootResource.prototype.rename = function (newName, callback) {

diff --git a/lib/resource/std/StandardResource.d.ts b/lib/resource/std/StandardResource.d.ts
@@ -27,7 +27,7 @@ export declare abstract class StandardResource implements IResource {
     getProperties(callback: ReturnCallback<object>): void;
     abstract create(callback: SimpleCallback): any;
     abstract delete(callback: SimpleCallback): any;
-    abstract moveTo(parent: IResource, newName: string, override: boolean, callback: SimpleCallback): any;
+    abstract moveTo(parent: IResource, newName: string, overwrite: boolean, callback: SimpleCallback): any;
     abstract rename(newName: string, callback: Return2Callback<string, string>): any;
     abstract append(data: Int8Array, targetSource: boolean, callback: SimpleCallback): any;
     abstract write(data: Int8Array, targetSource: boolean, callback: SimpleCallback): any;

diff --git a/lib/resource/virtual/VirtualResource.d.ts b/lib/resource/virtual/VirtualResource.d.ts
@@ -6,7 +6,7 @@ export declare abstract class VirtualResource extends StandardResource {
     constructor(name: string, parent?: IResource, fsManager?: FSManager);
     create(callback: SimpleCallback): void;
     delete(callback: SimpleCallback): void;
-    moveTo(parent: IResource, newName: string, override: boolean, callback: SimpleCallback): void;
+    moveTo(parent: IResource, newName: string, overwrite: boolean, callback: SimpleCallback): void;
     rename(newName: string, callback: Return2Callback<string, string>): void;
     webName(callback: ReturnCallback<string>): void;
     abstract type(callback: ReturnCallback<ResourceType>): any;

diff --git a/lib/resource/virtual/VirtualResource.js b/lib/resource/virtual/VirtualResource.js
@@ -31,7 +31,7 @@ var VirtualResource = (function (_super) {
     VirtualResource.prototype.delete = function (callback) {
         this.removeFromParent(callback);
     };
-    VirtualResource.prototype.moveTo = function (parent, newName, override, callback) {
+    VirtualResource.prototype.moveTo = function (parent, newName, overwrite, callback) {
         var _this = this;
         if (parent === this.parent) {
             this.rename(newName, function (e, oldName, newName) {

diff --git a/lib/server/commands/Move.js b/lib/server/commands/Move.js
@@ -10,7 +10,7 @@ function default_1(arg, callback) {
             return;
         }
         arg.requirePrivilege(['canMove'], r, function () {
-            var override = arg.findHeader('overwrite') === 'T';
+            var overwrite = arg.findHeader('overwrite') === 'T';
             var destination = arg.findHeader('destination');
             if (!destination) {
                 arg.setCode(WebDAVRequest_1.HTTPCodes.BadRequest);
@@ -22,7 +22,7 @@ function default_1(arg, callback) {
             destination = new FSManager_1.FSPath(destination);
             arg.server.getResourceFromPath(destination.getParent(), function (e, rDest) {
                 arg.requirePrivilege(['canAddChild'], rDest, function () {
-                    r.moveTo(rDest, destination.fileName(), override, function (e) {
+                    r.moveTo(rDest, destination.fileName(), overwrite, function (e) {
                         if (e)
                             arg.setCode(WebDAVRequest_1.HTTPCodes.InternalServerError);
                         else

diff --git a/src/resource/IResource.ts b/src/resource/IResource.ts
@@ -39,7 +39,7 @@ export interface IResource
     // ****************************** Actions ****************************** //
     create(callback : SimpleCallback)
     delete(callback : SimpleCallback)
-    moveTo(parent : IResource, newName : string, override : boolean, callback : SimpleCallback)
+    moveTo(parent : IResource, newName : string, overwrite : boolean, callback : SimpleCallback)
     rename(newName : string, callback : Return2Callback<string, string>)
 
     // ****************************** Tests ****************************** //

diff --git a/src/resource/physical/PhysicalResource.ts b/src/resource/physical/PhysicalResource.ts
@@ -27,7 +27,7 @@ export abstract class PhysicalResource extends StandardResource
     // ****************************** Actions ****************************** //
     abstract create(callback : SimpleCallback)
     abstract delete(callback : SimpleCallback)
-    moveTo(parent : IResource, newName : string, override : boolean, callback : SimpleCallback)
+    moveTo(parent : IResource, newName : string, overwrite : boolean, callback : SimpleCallback)
     {
         if(parent === this.parent)
         {

diff --git a/src/resource/std/RootResource.ts b/src/resource/std/RootResource.ts
@@ -25,7 +25,7 @@ export class RootResource extends StandardResource
     {
         callback(Errors.InvalidOperation)
     }
-    moveTo(parent : IResource, newName : string, override : boolean, callback : SimpleCallback)
+    moveTo(parent : IResource, newName : string, overwrite : boolean, callback : SimpleCallback)
     {
         callback(Errors.InvalidOperation)
     }

diff --git a/src/resource/std/StandardResource.ts b/src/resource/std/StandardResource.ts
@@ -177,7 +177,7 @@ export abstract class StandardResource implements IResource
     // ****************************** Actions ****************************** //
     abstract create(callback : SimpleCallback)
     abstract delete(callback : SimpleCallback)
-    abstract moveTo(parent : IResource, newName : string, override : boolean, callback : SimpleCallback)
+    abstract moveTo(parent : IResource, newName : string, overwrite : boolean, callback : SimpleCallback)
     abstract rename(newName : string, callback : Return2Callback<string, string>)
 
     // ****************************** Content ****************************** //

diff --git a/src/resource/virtual/VirtualResource.ts b/src/resource/virtual/VirtualResource.ts
@@ -29,7 +29,7 @@ export abstract class VirtualResource extends StandardResource
     {
         this.removeFromParent(callback);
     }
-    moveTo(parent : IResource, newName : string, override : boolean, callback : SimpleCallback)
+    moveTo(parent : IResource, newName : string, overwrite : boolean, callback : SimpleCallback)
     {
         if(parent === this.parent)
         {

diff --git a/src/server/commands/Move.ts b/src/server/commands/Move.ts
@@ -13,7 +13,7 @@ export default function(arg : MethodCallArgs, callback)
         }
 
         arg.requirePrivilege([ 'canMove' ], r, () => {
-            const override = arg.findHeader('overwrite') === 'T';
+            const overwrite = arg.findHeader('overwrite') === 'T';
 
             let destination : any = arg.findHeader('destination');
             if(!destination)
@@ -29,7 +29,7 @@ export default function(arg : MethodCallArgs, callback)
 
             arg.server.getResourceFromPath(destination.getParent(), (e, rDest) => {
                 arg.requirePrivilege([ 'canAddChild' ], rDest, () => {
-                    r.moveTo(rDest, destination.fileName(), override, (e) => {
+                    r.moveTo(rDest, destination.fileName(), overwrite, (e) => {
                         if(e)
                             arg.setCode(HTTPCodes.InternalServerError)
                         else