Skip to content

Commit c660795

Browse files
committed
#506 #504 Remove all usage of STR template, store last import location
1 parent a56bed9 commit c660795

27 files changed

+268
-127
lines changed

.idea/dataSources.xml

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/TcMenuDesigner_Single_Test.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

embeddedJavaExample/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?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">
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>com.thecoderscorner.menuexample</groupId>
4-
<artifactId>EmbeddedJavaDemo</artifactId>
5-
<name>EmbeddedJavaDemo</name>
4+
<artifactId>embeddedJavaExample</artifactId>
5+
<name>embeddedJavaExample</name>
66
<description>An application built with TcMenu Designer</description>
77
<version>0.0.1-SNAPSHOT</version>
88

tcMenuGenerator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<configuration>
167167
<source>${jdk.version}</source>
168168
<target>${jdk.version}</target>
169-
<compilerArgs>--enable-preview</compilerArgs>
169+
<!--compilerArgs>enable-preview</compilerArgs-->
170170
</configuration>
171171
</plugin>
172172
<plugin>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,15 @@ public void start(Stage primaryStage) throws Exception {
7575
appContext = new MenuEditorConfig();
7676
INSTANCE = this;
7777
} catch(Exception ex) {
78+
String msg;
79+
if(ex.getMessage().contains("Database lock acquisition failure")) {
80+
msg = "Please check if designer is already running, or you have opened the database in the .tcmenu directory.";
81+
} else {
82+
msg = "App did not start due to " + ex.getMessage() + ". See log for more details.";
83+
}
7884
System.getLogger(MenuEditorApp.class.getSimpleName()).log(ERROR, "Failed loading config", ex);
7985
AlertUtil.showAlertAndWait(AlertType.ERROR,"Could not load designer",
80-
"App did not start due to " + ex.getMessage() + ". See log for more details.",
86+
msg,
8187
ButtonType.CLOSE);
8288
primaryStage.close(); // make sure the app closes here.
8389
return;

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/cli/CodeGeneratorCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public Integer call() {
103103
.map(form -> getFirstByNameAndUuid(appContext.getEcDataStore(), project, form)).toList();
104104
} catch(Exception ex) {
105105
enabledFormObjects = List.of();
106-
System.err.println(STR."WARNING: Forms \{project.getOptions().getListOfEmbeddedForms()} didn't load");
106+
System.err.printf("WARNING: Forms %s didn't load\n", project.getOptions().getListOfEmbeddedForms());
107107
System.err.println("IMPORTANT: Conversion will continue but forms will be missing from the build");
108108
if(verbose) {
109109
ex.printStackTrace();

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/cli/StartUICommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static String userSelectedProject() {
3838

3939
public static void userDidSelectProject(File projectFile) {
4040
userSelectedProject.set(projectFile.getAbsolutePath());
41-
System.out.println(STR."Designer is starting with project \{userSelectedProject.get()}");
41+
System.out.println("Designer is starting with project " + userSelectedProject.get());
4242

4343
}
4444

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/generator/CodeGeneratorSupplier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public CodeGenerator getCodeGeneratorFor(EmbeddedPlatform platform, CodeGenerato
3232
} else if (javaPlatforms.contains(platform)) {
3333
return new EmbeddedJavaGenerator(configStorage, platform);
3434
} else {
35-
throw new IllegalArgumentException(STR."No such board type: \{platform}");
35+
throw new IllegalArgumentException("No such board type: " + platform);
3636
}
3737
}
3838
}

tcMenuGenerator/src/main/java/com/thecoderscorner/menu/editorui/generator/core/CoreCodeGenerator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public boolean startConversion(Path directory, List<CodePluginItem> codeGenerato
110110
this.localeHandler = handler;
111111
namingGenerator = new VariableNameGenerator(menuTree, options.isNamingRecursive());
112112
this.previousPluginFiles = previousPluginFiles;
113-
logLine(INFO, STR."Starting \{embeddedPlatform.getBoardId()} generate into : \{directory}");
113+
logLine(INFO, "Starting " + embeddedPlatform.getBoardId() + " generate into : " + directory);
114114

115115
hasRemotePlugins = codeGenerators.stream()
116116
.anyMatch(p -> p.getSubsystem() == SubSystem.REMOTE && !p.getId().equals(NO_REMOTE_ID));
@@ -381,7 +381,7 @@ private String toEmbeddedCppValue(MenuItem item, Object defaultValue) throws TcM
381381
return toEmbeddedCppTextValue(tmi, s);
382382
}
383383
case String _ -> {
384-
return STR."\"\{defaultValue}\"";
384+
return "\"" + defaultValue + "\"";
385385
}
386386
case PortableColor c when item instanceof Rgb32MenuItem rgbItem -> {
387387
if (rgbItem.isIncludeAlphaChannel()) {
@@ -474,7 +474,7 @@ protected void generateSource(List<CodePluginItem> generators, String cppFile,
474474
logLine(INFO, "Writing out source CPP file: " + cppFile);
475475

476476
writer.write(COMMENT_HEADER);
477-
writer.write(STR."// Generated for \{embeddedPlatform} by TcMenu \{configStore.getVersion()} on \{ISO_INSTANT.format(clock.instant())}.");
477+
writer.write("// Generated for %s by TcMenu %s on %s.".formatted(embeddedPlatform, configStore.getVersion(), ISO_INSTANT.format(clock.instant())));
478478
writer.append(TWO_LINES);
479479

480480
writer.write("#include <tcMenu.h>" + LINE_BREAK);

0 commit comments

Comments
 (0)