Added XML support for resource properties

OpenMarshal · May 14, 2017 · c4f206e · c4f206e
1 parent 0aea380
commit c4f206e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/lib/resource/IResource.d.ts b/lib/resource/IResource.d.ts
@@ -1,9 +1,11 @@
 import { FSManager, FSPath } from '../manager/FSManager';
+import { XMLElement } from '../helper/XML';
 import { LockKind } from './lock/LockKind';
 import { Lock } from './lock/Lock';
 export declare type SimpleCallback = (error: Error) => void;
 export declare type ReturnCallback<T> = (error: Error, data: T) => void;
 export declare type Return2Callback<T, Q> = (error: Error, x: T, y: Q) => void;
+export declare type ResourcePropertyValue = string | XMLElement | XMLElement[];
 export declare class ResourceType {
     isFile: boolean;
     isDirectory: boolean;
@@ -39,8 +41,8 @@ export interface IResource {
     addChild(resource: IResource, callback: SimpleCallback): any;
     removeChild(resource: IResource, callback: SimpleCallback): any;
     getChildren(callback: ReturnCallback<IResource[]>): any;
-    setProperty(name: string, value: string, callback: SimpleCallback): any;
-    getProperty(name: string, callback: ReturnCallback<string>): any;
+    setProperty(name: string, value: ResourcePropertyValue, callback: SimpleCallback): any;
+    getProperty(name: string, callback: ReturnCallback<ResourcePropertyValue>): any;
     removeProperty(name: string, callback: SimpleCallback): any;
     getProperties(callback: ReturnCallback<object>): any;
     creationDate(callback: ReturnCallback<number>): any;

diff --git a/lib/resource/std/StandardResource.d.ts b/lib/resource/std/StandardResource.d.ts
@@ -1,4 +1,4 @@
-import { IResource, ReturnCallback, SimpleCallback, Return2Callback, ResourceType } from '../IResource';
+import { IResource, ReturnCallback, SimpleCallback, Return2Callback, ResourceType, ResourcePropertyValue } from '../IResource';
 import { FSManager, FSPath } from '../../manager/FSManager';
 import { LockKind } from '../lock/LockKind';
 import { LockBag } from '../lock/LockBag';
@@ -20,8 +20,8 @@ export declare abstract class StandardResource implements IResource {
     removeLock(uuid: string, owner: string, callback: ReturnCallback<boolean>): void;
     canRemoveLock(uuid: string, owner: string, callback: ReturnCallback<boolean>): void;
     canLock(lockKind: LockKind, callback: ReturnCallback<boolean>): void;
-    setProperty(name: string, value: string, callback: SimpleCallback): void;
-    getProperty(name: string, callback: ReturnCallback<string>): void;
+    setProperty(name: string, value: ResourcePropertyValue, callback: SimpleCallback): void;
+    getProperty(name: string, callback: ReturnCallback<ResourcePropertyValue>): void;
     removeProperty(name: string, callback: SimpleCallback): void;
     getProperties(callback: ReturnCallback<object>): void;
     abstract create(callback: SimpleCallback): any;

diff --git a/src/resource/IResource.ts b/src/resource/IResource.ts
@@ -1,4 +1,5 @@
 import { FSManager, FSPath } from '../manager/FSManager'
+import { XMLElement } from '../helper/XML'
 import { LockKind } from './lock/LockKind'
 import { Lock } from './lock/Lock'
 import * as crypto from 'crypto'
@@ -7,6 +8,8 @@ export type SimpleCallback = (error : Error) => void
 export type ReturnCallback<T> = (error : Error, data : T) => void
 export type Return2Callback<T, Q> = (error : Error, x : T, y : Q) => void
 
+export type ResourcePropertyValue = string | XMLElement | XMLElement[]
+
 export class ResourceType
 {
     static File = new ResourceType(true, false)
@@ -63,8 +66,8 @@ export interface IResource
     getChildren(callback : ReturnCallback<IResource[]>)
 
     // ****************************** Properties ****************************** //
-    setProperty(name : string, value : string, callback : SimpleCallback)
-    getProperty(name : string, callback : ReturnCallback<string>)
+    setProperty(name : string, value : ResourcePropertyValue, callback : SimpleCallback)
+    getProperty(name : string, callback : ReturnCallback<ResourcePropertyValue>)
     removeProperty(name : string, callback : SimpleCallback)
     getProperties(callback : ReturnCallback<object>)
 

diff --git a/src/resource/std/StandardResource.ts b/src/resource/std/StandardResource.ts
@@ -1,4 +1,4 @@
-import { IResource, ReturnCallback, SimpleCallback, Return2Callback, ResourceType } from '../IResource'
+import { IResource, ReturnCallback, SimpleCallback, Return2Callback, ResourceType, ResourcePropertyValue } from '../IResource'
 import { FSManager, FSPath } from '../../manager/FSManager'
 import { LockScope } from '../lock/LockScope'
 import { LockType } from '../lock/LockType'
@@ -123,13 +123,13 @@ export abstract class StandardResource implements IResource
     }
 
     // ****************************** Properties ****************************** //
-    setProperty(name : string, value : string, callback : SimpleCallback)
+    setProperty(name : string, value : ResourcePropertyValue, callback : SimpleCallback)
     {
         this.properties[name] = value;
         this.updateLastModified();
         callback(null);
     }
-    getProperty(name : string, callback : ReturnCallback<string>)
+    getProperty(name : string, callback : ReturnCallback<ResourcePropertyValue>)
     {
         const value = this.properties[name];
         if(value === undefined)