Update package naming for real jxbrowser license key.

mfleisch · mfleisch · commit 4668def0ef78 · 2025-07-31T10:17:39.000+02:00
diff --git a/default_properties/annotations/src/main/java/de/unijena/bioinf/ms/properties/PropertyManager.java b/default_properties/annotations/src/main/java/de/unijena/bioinf/ms/properties/PropertyManager.java
@@ -227,6 +227,10 @@ public static void setProperty(String key, Object value) {
         CHANGED_PROPERTIES.setProperty(key, value);
     }
 
+    public static void setPropertyB64(String key, String value) {
+        CHANGED_PROPERTIES.setProperty(key, Base64.getEncoder().encodeToString(value.getBytes(StandardCharsets.UTF_8)));
+    }
+
     public static void setProperties(Properties properties) {
         properties.forEach((k, v) -> setProperty(String.valueOf(k), v));
     }
@@ -241,6 +245,10 @@ public static String getProperty(@NotNull String key) {
         return PROPERTIES.getString(key);
     }
 
+    public static String getPropertyB64(@NotNull String key) {
+        return new String(Base64.getDecoder().decode(PROPERTIES.getString(key)), StandardCharsets.UTF_8);
+    }
+
     public static Optional<String> getOptional(@NotNull String key, @Nullable String backupKey) {
         return Optional.ofNullable(getProperty(key, backupKey, null));
     }
diff --git a/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/SiriusGui.java b/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/SiriusGui.java
@@ -24,7 +24,7 @@
 import de.unijena.bioinf.ms.gui.net.ConnectionMonitor;
 import de.unijena.bioinf.ms.gui.properties.GuiProperties;
 import de.unijena.bioinf.ms.gui.utils.GuiUtils;
-import de.unijena.bioinf.ms.gui.webView.BrowserPanelProvider;
+import io.sirius.ms.gui.webView.BrowserPanelProvider;
 import de.unijena.bioinf.projectspace.GuiProjectManager;
 import io.sirius.ms.sdk.SiriusClient;
 import lombok.Getter;
diff --git a/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/SiriusGuiFactory.java b/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/SiriusGuiFactory.java
@@ -22,8 +22,8 @@
 package de.unijena.bioinf.ms.gui;
 
 import de.unijena.bioinf.ms.gui.net.ConnectionMonitor;
-import de.unijena.bioinf.ms.gui.webView.BrowserPanelProvider;
-import de.unijena.bioinf.ms.gui.webView.jxbrowser.JxBrowserPanelProvider;
+import io.sirius.ms.gui.webView.BrowserPanelProvider;
+import io.sirius.ms.gui.webView.jxbrowser.JxBrowserPanelProvider;
 import io.sirius.ms.sdk.SiriusClient;
 import io.sirius.ms.sse.DataEventType;
 import org.jetbrains.annotations.NotNull;
diff --git a/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/dialogs/AboutDialog.java b/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/dialogs/AboutDialog.java
@@ -27,7 +27,7 @@
 import de.unijena.bioinf.ms.gui.SiriusGui;
 import de.unijena.bioinf.ms.gui.compute.jjobs.Jobs;
 import de.unijena.bioinf.ms.gui.configs.Icons;
-import de.unijena.bioinf.ms.gui.webView.BrowserPanel;
+import io.sirius.ms.gui.webView.BrowserPanel;
 import de.unijena.bioinf.ms.properties.PropertyManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/lcms_viewer/LCMSViewerPanel.java b/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/lcms_viewer/LCMSViewerPanel.java
@@ -6,7 +6,7 @@
 import de.unijena.bioinf.ms.gui.utils.ToggableSidePanel;
 import de.unijena.bioinf.ms.gui.utils.loading.Loadable;
 import de.unijena.bioinf.ms.gui.utils.loading.LoadablePanel;
-import de.unijena.bioinf.ms.gui.webView.BrowserPanel;
+import io.sirius.ms.gui.webView.BrowserPanel;
 import de.unijena.bioinf.projectspace.FormulaResultBean;
 import de.unijena.bioinf.projectspace.InstanceBean;
 import io.sirius.ms.sdk.model.AlignedFeatureQualityExperimental;
diff --git a/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/login/UserLoginDialog.java b/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/login/UserLoginDialog.java
@@ -35,7 +35,7 @@
 import de.unijena.bioinf.ms.gui.utils.GuiUtils;
 import de.unijena.bioinf.ms.gui.utils.TwoColumnPanel;
 import de.unijena.bioinf.ms.gui.utils.loading.LoadablePanel;
-import de.unijena.bioinf.ms.gui.webView.BrowserPanel;
+import io.sirius.ms.gui.webView.BrowserPanel;
 import de.unijena.bioinf.ms.properties.PropertyManager;
 import de.unijena.bioinf.ms.rest.model.info.Term;
 import de.unijena.bioinf.rest.ProxyManager;
diff --git a/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/mainframe/result_panel/tabs/KendrickMassDefectPanel.java b/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/mainframe/result_panel/tabs/KendrickMassDefectPanel.java
@@ -6,7 +6,7 @@
 import de.unijena.bioinf.ms.gui.mainframe.instance_panel.CompoundList;
 import de.unijena.bioinf.ms.gui.mainframe.instance_panel.ExperimentListChangeListener;
 import de.unijena.bioinf.ms.gui.mainframe.result_panel.PanelDescription;
-import de.unijena.bioinf.ms.gui.webView.BrowserPanel;
+import io.sirius.ms.gui.webView.BrowserPanel;
 import de.unijena.bioinf.projectspace.InstanceBean;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/mainframe/result_panel/tabs/SketcherPanel.java b/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/mainframe/result_panel/tabs/SketcherPanel.java
@@ -3,17 +3,17 @@
 import com.teamdev.jxbrowser.js.JsPromise;
 import de.unijena.bioinf.ms.gui.SiriusGui;
 import de.unijena.bioinf.ms.gui.fingerid.FingerprintCandidateBean;
-import de.unijena.bioinf.ms.gui.webView.BrowserPanel;
-import de.unijena.bioinf.ms.gui.webView.BrowserPanelProvider;
+import io.sirius.ms.gui.webView.BrowserPanel;
+import io.sirius.ms.gui.webView.BrowserPanelProvider;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 
-import static de.unijena.bioinf.ms.gui.webView.BrowserPanel.parseNullable;
-import static de.unijena.bioinf.ms.gui.webView.BrowserPanelProvider.makeParameters;
+import static io.sirius.ms.gui.webView.BrowserPanel.parseNullable;
+import static io.sirius.ms.gui.webView.BrowserPanelProvider.makeParameters;
 
 
 public class SketcherPanel extends JPanel {
diff --git a/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/mainframe/result_panel/tabs/SpectraTreePanel.java b/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/mainframe/result_panel/tabs/SpectraTreePanel.java
@@ -3,7 +3,7 @@
 import de.unijena.bioinf.ms.gui.SiriusGui;
 import de.unijena.bioinf.ms.gui.molecular_formular.FormulaList;
 import de.unijena.bioinf.ms.gui.table.ActiveElementChangedListener;
-import de.unijena.bioinf.ms.gui.webView.BrowserPanel;
+import io.sirius.ms.gui.webView.BrowserPanel;
 import de.unijena.bioinf.projectspace.FormulaResultBean;
 import de.unijena.bioinf.projectspace.InstanceBean;
 import org.jetbrains.annotations.NotNull;
diff --git a/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/mainframe/result_panel/tabs/SpectralMatchingPanel.java b/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/mainframe/result_panel/tabs/SpectralMatchingPanel.java
@@ -29,7 +29,7 @@
 import de.unijena.bioinf.ms.gui.table.ActiveElementChangedListener;
 import de.unijena.bioinf.ms.gui.utils.loading.Loadable;
 import de.unijena.bioinf.ms.gui.utils.loading.LoadablePanel;
-import de.unijena.bioinf.ms.gui.webView.BrowserPanel;
+import io.sirius.ms.gui.webView.BrowserPanel;
 import de.unijena.bioinf.projectspace.InstanceBean;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
diff --git a/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/mainframe/result_panel/tabs/SubstructurePanel.java b/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/mainframe/result_panel/tabs/SubstructurePanel.java
@@ -3,7 +3,7 @@
 import ca.odell.glazedlists.swing.DefaultEventSelectionModel;
 import de.unijena.bioinf.ms.gui.SiriusGui;
 import de.unijena.bioinf.ms.gui.fingerid.FingerprintCandidateBean;
-import de.unijena.bioinf.ms.gui.webView.BrowserPanel;
+import io.sirius.ms.gui.webView.BrowserPanel;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/utils/GuiUtils.java b/sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/utils/GuiUtils.java
@@ -27,7 +27,7 @@
 import de.unijena.bioinf.ms.gui.configs.Fonts;
 import de.unijena.bioinf.ms.gui.configs.Icons;
 import de.unijena.bioinf.ms.gui.dialogs.ExceptionDialog;
-import de.unijena.bioinf.ms.gui.webView.BrowserPanelProvider;
+import io.sirius.ms.gui.webView.BrowserPanelProvider;
 import de.unijena.bioinf.ms.properties.PropertyManager;
 import it.unimi.dsi.fastutil.Pair;
 import org.jetbrains.annotations.NotNull;
diff --git a/sirius_gui/src/main/java/io/sirius/ms/gui/webView/BrowserDialog.java b/sirius_gui/src/main/java/io/sirius/ms/gui/webView/BrowserDialog.java
@@ -18,7 +18,7 @@
  *  You should have received a copy of the GNU Affero General Public License along with SIRIUS.  If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>
  */
 
-package de.unijena.bioinf.ms.gui.webView;
+package io.sirius.ms.gui.webView;
 
 import de.unijena.bioinf.rest.ProxyManager;
 import org.jetbrains.annotations.NotNull;
diff --git a/sirius_gui/src/main/java/io/sirius/ms/gui/webView/BrowserPanel.java b/sirius_gui/src/main/java/io/sirius/ms/gui/webView/BrowserPanel.java
@@ -1,4 +1,4 @@
-package de.unijena.bioinf.ms.gui.webView;
+package io.sirius.ms.gui.webView;
 
 import org.jetbrains.annotations.Nullable;
 
diff --git a/sirius_gui/src/main/java/io/sirius/ms/gui/webView/BrowserPanelProvider.java b/sirius_gui/src/main/java/io/sirius/ms/gui/webView/BrowserPanelProvider.java
@@ -1,4 +1,4 @@
-package de.unijena.bioinf.ms.gui.webView;
+package io.sirius.ms.gui.webView;
 
 import de.unijena.bioinf.ChemistryBase.utils.FileUtils;
 import de.unijena.bioinf.ChemistryBase.utils.Utils;
diff --git a/sirius_gui/src/main/java/io/sirius/ms/gui/webView/LinkInterception.java b/sirius_gui/src/main/java/io/sirius/ms/gui/webView/LinkInterception.java
@@ -1,4 +1,4 @@
-package de.unijena.bioinf.ms.gui.webView;
+package io.sirius.ms.gui.webView;
 
 public enum LinkInterception {
     NONE, EXTERNAL, ALL
diff --git a/sirius_gui/src/main/java/io/sirius/ms/gui/webView/WebViewIO.java b/sirius_gui/src/main/java/io/sirius/ms/gui/webView/WebViewIO.java
@@ -17,7 +17,7 @@
  *  You should have received a copy of the GNU Affero General Public License along with SIRIUS.  If not, see <https://www.gnu.org/licenses/agpl-3.0.txt>
  */
 
-package de.unijena.bioinf.ms.gui.webView;
+package io.sirius.ms.gui.webView;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/sirius_gui/src/main/java/io/sirius/ms/gui/webView/WebViewUtils.java b/sirius_gui/src/main/java/io/sirius/ms/gui/webView/WebViewUtils.java
@@ -1,4 +1,4 @@
-package de.unijena.bioinf.ms.gui.webView;
+package io.sirius.ms.gui.webView;
 
 import de.unijena.bioinf.ms.gui.configs.Colors;
 import de.unijena.bioinf.ms.gui.configs.Fonts;
diff --git a/sirius_gui/src/main/java/io/sirius/ms/gui/webView/jxbrowser/JxBrowserPanel.java b/sirius_gui/src/main/java/io/sirius/ms/gui/webView/jxbrowser/JxBrowserPanel.java
@@ -1,4 +1,4 @@
-package de.unijena.bioinf.ms.gui.webView.jxbrowser;
+package io.sirius.ms.gui.webView.jxbrowser;
 
 import com.teamdev.jxbrowser.browser.Browser;
 import com.teamdev.jxbrowser.browser.event.ConsoleMessageReceived;
@@ -7,8 +7,8 @@
 import com.teamdev.jxbrowser.navigation.event.FrameLoadFinished;
 import com.teamdev.jxbrowser.view.swing.BrowserView;
 import de.unijena.bioinf.ms.gui.utils.GuiUtils;
-import de.unijena.bioinf.ms.gui.webView.BrowserPanel;
-import de.unijena.bioinf.ms.gui.webView.LinkInterception;
+import io.sirius.ms.gui.webView.BrowserPanel;
+import io.sirius.ms.gui.webView.LinkInterception;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/sirius_gui/src/main/java/io/sirius/ms/gui/webView/jxbrowser/JxBrowserPanelProvider.java b/sirius_gui/src/main/java/io/sirius/ms/gui/webView/jxbrowser/JxBrowserPanelProvider.java
@@ -1,13 +1,13 @@
-package de.unijena.bioinf.ms.gui.webView.jxbrowser;
+package io.sirius.ms.gui.webView.jxbrowser;
 
 import com.teamdev.jxbrowser.engine.Engine;
 import com.teamdev.jxbrowser.engine.EngineOptions;
 import com.teamdev.jxbrowser.engine.Theme;
 import com.teamdev.jxbrowser.permission.PermissionType;
 import com.teamdev.jxbrowser.permission.callback.RequestPermissionCallback;
 import de.unijena.bioinf.ms.gui.configs.Colors;
-import de.unijena.bioinf.ms.gui.webView.BrowserPanelProvider;
-import de.unijena.bioinf.ms.gui.webView.LinkInterception;
+import io.sirius.ms.gui.webView.BrowserPanelProvider;
+import io.sirius.ms.gui.webView.LinkInterception;
 import de.unijena.bioinf.ms.properties.PropertyManager;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
@@ -33,7 +33,7 @@ public JxBrowserPanelProvider(@NotNull URI baseUrl) {
     private static Engine setupEngine(){
         EngineOptions opts = EngineOptions
                 .newBuilder(OFF_SCREEN)
-                .licenseKey(PropertyManager.getProperty("jxbrowser.license.key"))
+                .licenseKey(PropertyManager.getPropertyB64("jxbrowser.license.key"))
                 .disableTouchMenu()
                 .enableIncognito() // no storage dir, all in memory, fresh state after every start.
                 .build();

Original file line number	Diff line number	Diff line change
`@@ -227,6 +227,10 @@ public static void setProperty(String key, Object value) {`
`227`	`227`	`CHANGED_PROPERTIES.setProperty(key, value);`
`228`	`228`	`}`
`229`	`229`
	`230`	`+ public static void setPropertyB64(String key, String value) {`
	`231`	`+ CHANGED_PROPERTIES.setProperty(key, Base64.getEncoder().encodeToString(value.getBytes(StandardCharsets.UTF_8)));`
	`232`	`+ }`
	`233`	`+`
`230`	`234`	`public static void setProperties(Properties properties) {`
`231`	`235`	`properties.forEach((k, v) -> setProperty(String.valueOf(k), v));`
`232`	`236`	`}`
`@@ -241,6 +245,10 @@ public static String getProperty(@NotNull String key) {`
`241`	`245`	`return PROPERTIES.getString(key);`
`242`	`246`	`}`
`243`	`247`
	`248`	`+ public static String getPropertyB64(@NotNull String key) {`
	`249`	`+ return new String(Base64.getDecoder().decode(PROPERTIES.getString(key)), StandardCharsets.UTF_8);`
	`250`	`+ }`
	`251`	`+`
`244`	`252`	`public static Optional<String> getOptional(@NotNull String key, @Nullable String backupKey) {`
`245`	`253`	`return Optional.ofNullable(getProperty(key, backupKey, null));`
`246`	`254`	`}`