Merge pull request #503 from TcMenu/main-all-builder-theme

Fix light mode embedControl, remove STR, import directory

Author: davetcc

.idea/dataSources.xml

@@ -51,15 +51,7 @@ private void updateColor(ColorComponentType compType, Map<ColorComponentType, Co
         } else {
             color = new ControlColor(); // not in use color
         }
-        switch (compType) {
-            case TEXT_FIELD -> settings.getTextColor().copyColorsFrom(color);
-            case BUTTON -> settings.getButtonColor().copyColorsFrom(color);
-            case HIGHLIGHT -> settings.getHighlightColor().copyColorsFrom(color);
-            case CUSTOM -> settings.getUpdateColor().copyColorsFrom(color);
-            case DIALOG -> settings.getDialogColor().copyColorsFrom(color);
-            case ERROR -> settings.getErrorColor().copyColorsFrom(color);
-            case PENDING -> settings.getPendingColor().copyColorsFrom(color);
-        }
+        settings.getUnderlyingColor(compType).copyColorsFrom(color);
     }
 
     public TcPreferencesPersistence(GlobalSettings settings) {

.idea/misc.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><!-- it is safe to edit this file, it will not be replaced by TcMenu designer unless you delete it --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.thecoderscorner.menuexample</groupId>
-    <artifactId>EmbeddedJavaDemo</artifactId>
-    <name>EmbeddedJavaDemo</name>
+    <artifactId>embeddedJavaExample</artifactId>
+    <name>embeddedJavaExample</name>
     <description>An application built with TcMenu Designer</description>
     <version>0.0.1-SNAPSHOT</version>
 

.idea/runConfigurations/TcMenuDesigner_Single_Test.xml

@@ -166,7 +166,7 @@
                 <configuration>
                     <source>${jdk.version}</source>
                     <target>${jdk.version}</target>
-                    <compilerArgs>--enable-preview</compilerArgs>
+                    <!--compilerArgs>enable-preview</compilerArgs-->
                 </configuration>
             </plugin>
             <plugin>

embedCONTROLCore/src/main/java/com/thecoderscorner/embedcontrol/core/service/TcPreferencesPersistence.java

@@ -75,9 +75,15 @@ public void start(Stage primaryStage) throws Exception {
             appContext = new MenuEditorConfig();
             INSTANCE = this;
         } catch(Exception ex) {
+            String msg;
+            if(ex.getMessage().contains("Database lock acquisition failure")) {
+                msg = "Please check if designer is already running, or you have opened the database in the .tcmenu directory.";
+            } else {
+                msg = "App did not start due to " + ex.getMessage() + ". See log for more details.";
+            }
             System.getLogger(MenuEditorApp.class.getSimpleName()).log(ERROR, "Failed loading config", ex);
             AlertUtil.showAlertAndWait(AlertType.ERROR,"Could not load designer",
-                    "App did not start due to " + ex.getMessage() + ". See log for more details.",
+                    msg,
                     ButtonType.CLOSE);
             primaryStage.close(); // make sure the app closes here.
             return;

embeddedJavaExample/pom.xml

@@ -103,7 +103,7 @@ public Integer call() {
                         .map(form -> getFirstByNameAndUuid(appContext.getEcDataStore(), project, form)).toList();
             } catch(Exception ex) {
                 enabledFormObjects = List.of();
-                System.err.println(STR."WARNING: Forms \{project.getOptions().getListOfEmbeddedForms()} didn't load");
+                System.err.printf("WARNING: Forms %s didn't load\n", project.getOptions().getListOfEmbeddedForms());
                 System.err.println("IMPORTANT: Conversion will continue but forms will be missing from the build");
                 if(verbose) {
                     ex.printStackTrace();

tcMenuGenerator/pom.xml

@@ -38,7 +38,7 @@ public static String userSelectedProject() {
 
     public static void userDidSelectProject(File projectFile) {
         userSelectedProject.set(projectFile.getAbsolutePath());
-        System.out.println(STR."Designer is starting with project \{userSelectedProject.get()}");
+        System.out.println("Designer is starting with project " + userSelectedProject.get());
 
     }
 

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

@@ -32,7 +32,7 @@ public CodeGenerator getCodeGeneratorFor(EmbeddedPlatform platform, CodeGenerato
         } else if (javaPlatforms.contains(platform)) {
             return new EmbeddedJavaGenerator(configStorage, platform);
         } else {
-            throw new IllegalArgumentException(STR."No such board type: \{platform}");
+            throw new IllegalArgumentException("No such board type: " + platform);
         }
     }
 }