Merge pull request #495 from TcMenu/main-remote-theme

#491 #494 #453 remove online library version checker, add remote plugin, themebuilder for mono themes

Author: davetcc

embedCONTROLCore/pom.xml

@@ -13,7 +13,7 @@
     <artifactId>embedCONTROLCore</artifactId>
     <name>embedCONTROLCore</name>
     <description>TcMenu embedCONTROL shared core</description>
-    <version>4.3.0</version>
+    <version>4.3.1-SNAPSHOT</version>
     <url>https://www.thecoderscorner.com/products/arduino-libraries/tc-menu/</url>
 
     <licenses>

embeddedJavaExample/pom.xml

@@ -10,7 +10,7 @@
         <jdk.version>22</jdk.version>
         <jfx.version>22.0.2</jfx.version>
         <jserialcomm.version>2.11.0</jserialcomm.version>
-        <tcmenu.api.version>4.3.0</tcmenu.api.version>
+        <tcmenu.api.version>4.3.1-SNAPSHOT</tcmenu.api.version>
         <timestamp>${maven.build.timestamp}</timestamp>
     </properties>
 

tcMenuGenerator/pom.xml

@@ -12,7 +12,7 @@
     <name>menuEditorUI</name>
     <groupId>com.thecoderscorner.tcmenu</groupId>    
     <description>JavaFX based menu editor UI</description>
-    <version>4.3.0</version>
+    <version>4.3.1-SNAPSHOT</version>
 
     <properties>
         <timestamp>${maven.build.timestamp}</timestamp>

tcMenuGenerator/scripts/packager-all-platforms.md

@@ -1,8 +1,8 @@
 # How to build tcMenu Designer into a native package using OpenJDK 17 onwards.
 
-**For most users, we recommend using our pre-packaged software.** However, should you wish to build it yourself, follow these instructions, you'll end up with a native installer for Windows, a disk image for macOS, or a debian install archive for Linux. Please only use these steps to build a UI for you own purposes.
+**For most users, we recommend using our pre-packaged software.** However, should you wish to build it yourself, follow these instructions, you'll end up with a native executable for Windows, a disk image for macOS, or an  archive for Linux. Please only use these steps to build a UI for you own purposes.
 
-Firstly, ensure that you have OpenJDK 18 and a recent maven 3 on your system, without these it will not be possible to build.
+Firstly, ensure that you have the most recent OpenJDK and a recent version of maven on your system, without these it will not be possible to build.
 
 * All OpenJDK's that we've tested work for this, we've tried: Liberica, Adoptium, Amazon Corretto and Microsoft JDK.   
 * For Apache maven we recommend using [https://maven.apache.org/]
@@ -82,23 +82,3 @@ Drop to a command-line, in the tcMenu/embedCONTROLCore directory, run a local ma
 Testing before deployment
 
     java --module-path ../deps "-Dprism.lcdtext=false" -m com.thecoderscorner.tcmenu.embedcontrolfx/com.thecoderscorner.embedcontrol.jfxapp.EmbedControlApp
-
-### Building the embedCONTROLFx desktop UI for Windows
-
-Ensure you are in the embedCONTROLFx/target directory.
-
-    cp classes/fximg/embedCONTROL.ico .
-
-    jpackage --type app-image -n embedCONTROL -p jfx/deps --input jfx/app --resource-dir .\classes\fximg\ --icon embedCONTROL.ico --app-version 4.1.2 --verbose --java-options "-Dprism.lcdtext=false" --add-modules "jdk.crypto.cryptoki" -m com.thecoderscorner.tcmenu.embedcontrolfx/com.thecoderscorner.embedcontrol.jfxapp.EmbedControlApp
-
-### Building the embedCONTROLFx desktop for macOS
-
-Ensure you are in the embedCONTROLFx/target directory.
-
-    jpackage -n embedCONTROL -p jfx/deps --input jfx/app --icon ./classes/fximg/MyIcon.icns --vendor TheCodersCorner --app-version 4.1.2 --verbose --license-file ../../LICENSE --java-options "-Dprism.lcdtext=false" --add-modules "jdk.crypto.cryptoki" -m com.thecoderscorner.tcmenu.embedcontrolfx/com.thecoderscorner.embedcontrol.jfxapp.EmbedControlApp
-
-### Building the embedCONTROLFx desktop for Linux
-
-Ensure you are in the embedCONTROLFx/target directory.
-
-    jpackage -n embedCONTROL -p jfx/deps --input jfx/app --icon ./classes/fximg/large_icon.png --verbose --license-file ../../LICENSE --linux-app-category Utility --linux-menu-group "Utility;" --java-options "-Dprism.lcdtext=false" --app-version 4.1.2  --add-modules "jdk.crypto.cryptoki" -m com.thecoderscorner.tcmenu.embedcontrolfx/com.thecoderscorner.embedcontrol.jfxapp.EmbedControlApp

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/MenuEditorApp.java

@@ -304,6 +304,11 @@ public byte[] postRequestForBinaryData(String url, String parameter, HttpDataTyp
             throw new IOException("Boom");
         }
 
+        @Override
+        public String getRequestForString(String url) throws IOException {
+            throw new IOException("Boom");
+        }
+
         @Override
         public String postRequestForString(String url, String parameter, HttpDataType reqDataType) throws IOException {
             throw new IOException("Boom");

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/controller/GeneralSettingsController.java

@@ -3,12 +3,11 @@
 import com.thecoderscorner.embedcontrol.core.service.GlobalSettings;
 import com.thecoderscorner.embedcontrol.core.util.TccDatabaseUtilities;
 import com.thecoderscorner.menu.editorui.MenuEditorApp;
-import com.thecoderscorner.menu.editorui.generator.LibraryVersionDetector;
+import com.thecoderscorner.menu.editorui.generator.AppVersionDetector;
 import com.thecoderscorner.menu.editorui.generator.arduino.ArduinoLibraryInstaller;
 import com.thecoderscorner.menu.editorui.generator.plugin.CodePluginManager;
 import com.thecoderscorner.menu.editorui.storage.ConfigurationStorage;
 import com.thecoderscorner.menu.editorui.util.StringHelper;
-import com.thecoderscorner.menu.persist.ReleaseType;
 import com.thecoderscorner.menu.persist.VersionInfo;
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyObjectWrapper;
@@ -30,7 +29,8 @@
 import java.util.concurrent.Executors;
 import java.util.function.Supplier;
 
-import static com.thecoderscorner.menu.editorui.generator.arduino.ArduinoLibraryInstaller.InstallationType.*;
+import static com.thecoderscorner.menu.editorui.generator.arduino.ArduinoLibraryInstaller.InstallationType.CURRENT_APP;
+import static com.thecoderscorner.menu.editorui.generator.arduino.ArduinoLibraryInstaller.InstallationType.CURRENT_LIB;
 import static com.thecoderscorner.menu.editorui.util.AlertUtil.showAlertAndWait;
 import static com.thecoderscorner.menu.persist.VersionInfo.ERROR_VERSION;
 import static java.lang.System.Logger.Level.ERROR;
@@ -55,9 +55,7 @@ public class GeneralSettingsController {
     public TextField libsTextField;
     public Button chooseArduinoButton;
     public Button chooseLibsButton;
-    public ComboBox<ReleaseType> pluginStreamCombo;
     public TableColumn<NameWithVersion, String> libraryNameColumn;
-    public TableColumn<NameWithVersion, String> expectedVerCol;
     public TableColumn<NameWithVersion, String> actualVerCol;
     public TableView<NameWithVersion> versionsTable;
     public ListView<String> additionalPathsList;
@@ -71,23 +69,23 @@ public class GeneralSettingsController {
     public Spinner<Integer> fontSizeSpinner;
     private ConfigurationStorage storage;
     private String homeDirectory;
-    private LibraryVersionDetector versionDetector;
+    private AppVersionDetector versionDetector;
     private CodePluginManager pluginManager;
     private ArduinoLibraryInstaller installer;
     private final ResourceBundle bundle = MenuEditorApp.getBundle();
     private GlobalSettings settings;
     private TccDatabaseUtilities databaseUtilities;
 
-    public void initialise(ConfigurationStorage storage, LibraryVersionDetector versionDetector,
+    public void initialise(ConfigurationStorage storage, AppVersionDetector versionDetector,
                            ArduinoLibraryInstaller installer, CodePluginManager pluginManager,
                            GlobalSettings settings, TccDatabaseUtilities utilities, String homeDirectory) {
         this.installer = installer;
         this.pluginManager = pluginManager;
         this.storage = storage;
         this.homeDirectory = homeDirectory;
-        this.versionDetector = versionDetector;
         this.settings = settings;
         this.databaseUtilities = utilities;
+        this.versionDetector = versionDetector;
 
         usingArduinoLibsCheck.setSelected(storage.isUsingArduinoIDE());
         useFullyQualifiedNamesField.setSelected(storage.isDefaultRecursiveNamingOn());
@@ -115,12 +113,8 @@ public void initialise(ConfigurationStorage storage, LibraryVersionDetector vers
         });
 
         libraryNameColumn.setCellValueFactory(cell -> new ReadOnlyObjectWrapper<>(cell.getValue().name()));
-        expectedVerCol.setCellValueFactory(cell -> new ReadOnlyObjectWrapper<>(cell.getValue().available().toString()));
         actualVerCol.setCellValueFactory(cell -> new ReadOnlyObjectWrapper<>(cell.getValue().installed().toString()));
 
-        pluginStreamCombo.setItems(FXCollections.observableList(Arrays.asList(ReleaseType.values())));
-        pluginStreamCombo.getSelectionModel().select(versionDetector.getReleaseType());
-
         additionalPathsList.getSelectionModel().selectedItemProperty().addListener((observableValue, s1, s2) ->
                 removePathBtn.setDisable(additionalPathsList.getSelectionModel().getSelectedItem() == null));
 
@@ -168,7 +162,7 @@ private LocaleWithDescription findLocaleInList(Locale chosenLocale) {
         for (var locDesc : availableLocales) {
             if(locDesc.locale().equals(chosenLocale)) return locDesc;
         }
-        return availableLocales.get(0);
+        return availableLocales.getFirst();
     }
 
     private void setDirectoryPickerOrEmpty(TextField field, Optional<String> maybePath, Supplier<Optional<String>> defaulter) {
@@ -286,21 +280,13 @@ public void onClose(ActionEvent actionEvent) {
         s.close();
     }
 
-    public void onStreamChanged(ActionEvent actionEvent) {
-        var newStream = pluginStreamCombo.getSelectionModel().getSelectedItem();
-        if(newStream != null) {
-            versionDetector.changeReleaseType(newStream);
-            onRefreshLibraries(actionEvent);
-        }
-    }
-
     public void onRefreshLibraries(ActionEvent actionEvent) {
         populateVersions();
     }
 
     private void populateVersions() {
         var fr = executor.submit(() -> {
-            versionDetector.acquireVersions();
+            versionDetector.acquireVersion();
             Platform.runLater(this::populateListAfterRequest);
         });
     }
@@ -322,7 +308,6 @@ private void populateListAfterRequest() {
             versionsTable.getItems().add(new NameWithVersion(
                     "TcMenuDesigner UI", "tcMenuDesigner",
                     false,
-                    getVersionOfLibraryOrError("java-app", AVAILABLE_APP),
                     getVersionOfLibraryOrError("java-app", CURRENT_APP)
             ));
 
@@ -334,13 +319,11 @@ private void populateListAfterRequest() {
     }
 
     private NameWithVersion findLibVersion(String libName) throws IOException {
-        var available = installer.getVersionOfLibrary(libName, AVAILABLE_LIB);
         var installed = installer.getVersionOfLibrary(libName, CURRENT_LIB);
 
-        if(available == null) available = ERROR_VERSION;
         if(installed == null) installed = ERROR_VERSION;
 
-        return new NameWithVersion(libName + " library", libName, false, available, installed);
+        return new NameWithVersion(libName + " library", libName, false, installed);
     }
 
     private VersionInfo getVersionOfLibraryOrError(String name, ArduinoLibraryInstaller.InstallationType type) {
@@ -403,7 +386,7 @@ public void onUuidChanged(ActionEvent actionEvent) {
         }
     }
 
-    public record NameWithVersion(String name, String underlyingId, boolean isPlugin, VersionInfo available, VersionInfo installed) { }
+    public record NameWithVersion(String name, String underlyingId, boolean isPlugin, VersionInfo installed) { }
 
     static class NameWithVersionValueFactory implements Callback<TableColumn.CellDataFeatures<NameWithVersion, NameWithVersion>, ObservableValue<NameWithVersion>> {
         @Override

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/controller/MenuEditorController.java

@@ -17,7 +17,7 @@
 import com.thecoderscorner.menu.editorui.dialog.ChooseIoExpanderDialog;
 import com.thecoderscorner.menu.editorui.dialog.EditMenuInMenuDialog;
 import com.thecoderscorner.menu.editorui.embed.FormManagerDialog;
-import com.thecoderscorner.menu.editorui.generator.LibraryVersionDetector;
+import com.thecoderscorner.menu.editorui.generator.AppVersionDetector;
 import com.thecoderscorner.menu.editorui.generator.arduino.ArduinoLibraryInstaller;
 import com.thecoderscorner.menu.editorui.generator.core.VariableNameGenerator;
 import com.thecoderscorner.menu.editorui.generator.plugin.CodePluginManager;
@@ -110,7 +110,7 @@ public class MenuEditorController {
     private CurrentProjectEditorUI editorUI;
     private CodePluginManager pluginManager;
     private JdbcTcMenuConfigurationStore configStore;
-    private LibraryVersionDetector libVerDetector;
+    private AppVersionDetector libVerDetector;
     private int menuToProjectMaxLevels = 1;
     private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
     private final ResourceBundle bundle = MenuEditorApp.getBundle();
@@ -119,7 +119,7 @@ public class MenuEditorController {
     public void initialise(CurrentEditorProject editorProject, ArduinoLibraryInstaller installer,
                            CurrentProjectEditorUI editorUI, CodePluginManager pluginManager,
                            JdbcTcMenuConfigurationStore storage,
-                           LibraryVersionDetector libraryVersionDetector, boolean initialWindow) {
+                           AppVersionDetector libraryVersionDetector, boolean initialWindow) {
         this.editorProject = editorProject;
         this.installer = installer;
         this.editorUI = editorUI;
@@ -681,7 +681,7 @@ public void onShowExpanders(ActionEvent actionEvent) {
     public void onPrepareDiagnostics(ActionEvent actionEvent) {
         try {
             StringBuilder sb = new StringBuilder(255);
-            sb.append("tcMenu diagnostics - stream ").append(libVerDetector.getReleaseType()).append(LINE_BREAK);
+            sb.append("tcMenu diagnostics").append(LINE_BREAK);
             sb.append("TcMenuDesigner Version - ").append(configStore.getVersion()).append(LINE_BREAK);
             sb.append("Plugin versions:").append(LINE_BREAK);
             for(var pl : pluginManager.getLoadedPlugins()) {