+ added an option to configure the java executable(references #26)

~ setting for `Default processor for includes` actually shows the saved value now.
joethei · May 4, 2022 · 5c5ba62 · 5c5ba62
1 parent 307c39c
commit 5c5ba62
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 9 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-plantuml",
 	"name": "PlantUML",
-	"version": "1.6.2",
+	"version": "1.6.3",
 	"minAppVersion": "0.13.0",
 	"description": "Render PlantUML Diagrams",
 	"author": "Johannes Theiner",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "obsidian-plantuml",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "description": "PlantUML rendering for Obsidian.md",
   "main": "main.js",
   "scripts": {

diff --git a/src/debouncedProcessors.ts b/src/debouncedProcessors.ts
@@ -16,7 +16,6 @@ export class DebouncedProcessors implements Processor {
         this.plugin = plugin;
         const debounceTime = plugin.settings.debounce;
         this.debounceTime = debounceTime * this.SECONDS_TO_MS_FACTOR;
-
     }
 
     png = async (source: string, el: HTMLElement, ctx: MarkdownPostProcessorContext) => {

diff --git a/src/localProcessors.ts b/src/localProcessors.ts
@@ -42,7 +42,7 @@ export class LocalProcessors implements Processor {
             '-charset utf-8',
             '-pipemap'
         ];
-        const child = exec('java ' + args.join(" "), {encoding: 'binary', cwd: path});
+        const child = exec(this.plugin.settings.javaPath + ' ' + args.join(" "), {encoding: 'binary', cwd: path});
 
         let stdout = "";
 
@@ -88,9 +88,9 @@ export class LocalProcessors implements Processor {
 
         let child: typeof ChildProcess;
         if (type === OutputType.PNG) {
-            child = exec('java ' + args.join(" "), {encoding: 'binary', cwd: path});
+            child = exec(this.plugin.settings.javaPath + ' ' + args.join(" "), {encoding: 'binary', cwd: path});
         } else {
-            child = exec('java ' + args.join(" "), {encoding: 'utf-8', cwd: path});
+            child = exec(this.plugin.settings.javaPath + ' ' + args.join(" "), {encoding: 'utf-8', cwd: path});
         }
 
         let stdout: any;

diff --git a/src/settings.ts b/src/settings.ts
@@ -6,6 +6,7 @@ export interface PlantUMLSettings {
     header: string;
     debounce: number;
     localJar: string;
+    javaPath: string;
     defaultProcessor: string;
 }
 
@@ -14,6 +15,7 @@ export const DEFAULT_SETTINGS: PlantUMLSettings = {
     header: '',
     debounce: 3,
     localJar: '',
+    javaPath: 'java',
     defaultProcessor: "png",
 }
 
@@ -53,6 +55,18 @@ export class PlantUMLSettingsTab extends PluginSettingTab {
                         }
                     )
                 );
+
+            new Setting(containerEl)
+                .setName("Java Path")
+                .setDesc("Path to Java executable")
+                .addText(text => text.setPlaceholder(DEFAULT_SETTINGS.javaPath)
+                    .setValue(this.plugin.settings.javaPath)
+                    .onChange(async (value) => {
+                            this.plugin.settings.javaPath = value;
+                            await this.plugin.saveSettings();
+                        }
+                    )
+                );
         }
 
         new Setting(containerEl)
@@ -62,6 +76,7 @@ export class PlantUMLSettingsTab extends PluginSettingTab {
                dropdown
                    .addOption("png", "PNG")
                    .addOption("svg", "SVG")
+                   .setValue(this.plugin.settings.defaultProcessor)
                    .onChange(async(value) => {
                       this.plugin.settings.defaultProcessor = value;
                       await this.plugin.saveSettings();
@@ -79,7 +94,7 @@ export class PlantUMLSettingsTab extends PluginSettingTab {
                             }
                         )
                     text.inputEl.setAttr("rows", 4);
-                    text.inputEl.addClass("settings_area")
+                    text.inputEl.addClass("puml-settings-area")
                 }
             );
         new Setting(containerEl).setName("Debounce")

diff --git a/styles.css b/styles.css
@@ -1,4 +1,4 @@
-.settings_area {
+.puml-settings-area {
     margin-left: 5px;
     margin-right: 5px;
     font-size: 14px;
@@ -32,3 +32,7 @@
 .internal-embed.file-embed[src$=".pu"] {
     display: none;
 }
+
+.puml-error {
+    color: var(--text-error);
+}
diff --git a/versions.json b/versions.json
@@ -20,5 +20,6 @@
 	"1.5.3": "0.13.0",
 	"1.6.0": "0.13.0",
 	"1.6.1": "0.13.0",
-	"1.6.2": "0.13.0"
+	"1.6.2": "0.13.0",
+	"1.6.3": "0.13.0"
 }