fix merge problem

Author: EduardKrieger

runners/wikiEclipse/index.ts

@@ -17,7 +17,7 @@ export class WikiEclipse extends WikiRunner {
 
     runCreateFile(runCommand: RunCommand): RunResult{
         let fileName = path.basename(runCommand.command.parameters[0]);
-        let filePath = path.join(this.getVariable(this.workspaceDirectory), runCommand.command.parameters[0].replace(fileName, ""));
+        let filePath = path.join(this.getVariable(this.WORKSPACE_DIRECTORY), runCommand.command.parameters[0].replace(fileName, ""));
         filePath = path.relative(this.getWorkingDirectory(), filePath).replace(/\\/g, "/");
         let fileType = this.fileTypeMap.get(fileName.substr(fileName.indexOf(".")));
         let parentFolder = path.basename(filePath);

runners/wikiEditor/index.ts

@@ -19,7 +19,7 @@ export class WikiEditor extends WikiRunner {
 
     runCreateFile(runCommand: RunCommand): RunResult{
         let fileName = path.basename(runCommand.command.parameters[0]);
-        let filePath = path.join(this.getVariable(this.workspaceDirectory), runCommand.command.parameters[0].replace(fileName, ""));
+        let filePath = path.join(this.getVariable(this.WORKSPACE_DIRECTORY), runCommand.command.parameters[0].replace(fileName, ""));
         filePath = path.relative(this.getWorkingDirectory(), filePath).replace(/\\/g, "/");
         let fileType = this.fileTypeMap.get(fileName.substr(fileName.indexOf(".")));
         let content = runCommand.command.parameters[1] 
@@ -30,7 +30,7 @@ export class WikiEditor extends WikiRunner {
     }
 
     runChangeFile(runCommand: RunCommand): RunResult{
-        let workspacePath = this.getVariable(this.workspaceDirectory).replace(/\\/g, "/");
+        let workspacePath = this.getVariable(this.WORKSPACE_DIRECTORY).replace(/\\/g, "/");
         let fileName = path.basename(runCommand.command.parameters[0]);
         let filePath = path.join(workspacePath,runCommand.command.parameters[0].replace(fileName, "")); 
         let contentPath, contentFile, contentString;

runners/wikiVsCode/index.ts

@@ -18,7 +18,7 @@ export class WikiVsCode extends WikiRunner {
 
     runCreateFile(runCommand: RunCommand): RunResult{
         let fileName = path.basename(runCommand.command.parameters[0]);
-        let filePath = path.join(this.getVariable(this.workspaceDirectory), runCommand.command.parameters[0].replace(fileName, ""));
+        let filePath = path.join(this.getVariable(this.WORKSPACE_DIRECTORY), runCommand.command.parameters[0].replace(fileName, ""));
         filePath = path.relative(this.getWorkingDirectory(), filePath).replace(/\\/g, "/");
         let fileType = this.fileTypeMap.get(fileName.substr(fileName.indexOf(".")));
         let content = runCommand.command.parameters[1] 
@@ -29,7 +29,7 @@ export class WikiVsCode extends WikiRunner {
     }
 
     runChangeFile(runCommand: RunCommand): RunResult{
-        let workspacePath = this.getVariable(this.workspaceDirectory).replace(/\\/g, "/");
+        let workspacePath = this.getVariable(this.WORKSPACE_DIRECTORY).replace(/\\/g, "/");
         let fileName = path.basename(runCommand.command.parameters[0]);
         let filePath = path.join(workspacePath,runCommand.command.parameters[0].replace(fileName, "")); 
         let contentPath, contentFile, contentString;