- kleine Überarbeitung am Merger, damit er besser auf MacOS läuft

heinrich26 · heinrich26 · commit 6d1bce575fe9 · 2025-03-10T22:58:39.000+01:00
diff --git a/merger/build.gradle b/merger/build.gradle
@@ -6,6 +6,8 @@ plugins {
     id 'org.beryx.runtime' version '1.12.7'
 }
 
+project.description = 'Fügt mehrere Kurswahlen in eine CSV Tabelle zusammen!'
+
 application {
     mainClass = "${group}.gui.GuiMain"
 }
diff --git a/merger/res/mac-merger.properties b/merger/res/mac-merger.properties
@@ -1,3 +1,3 @@
 main-class=com.kurswahlApp.GeneratorKt
-arguments=--gui
+arguments=willi.json --gui
 icon="../res/icons/app_icon.icns"
diff --git a/merger/settings.gradle b/merger/settings.gradle
diff --git a/merger/src/main/kotlin/Generator.kt b/merger/src/main/kotlin/Generator.kt
@@ -131,7 +131,7 @@ fun main(args: Array<String>) {
             output = chooser.selectedFile.absolutePath
         }
 
-        action = TYP.values().getOrElse(JOptionPane.showOptionDialog(null, "Aktion auswählen", "Auswählen", JOptionPane.DEFAULT_OPTION, JOptionPane.PLAIN_MESSAGE, null, TYP.values(), TYP.CSV)
+        action = TYP.entries.toTypedArray().getOrElse(JOptionPane.showOptionDialog(null, "Aktion auswählen", "Auswählen", JOptionPane.DEFAULT_OPTION, JOptionPane.PLAIN_MESSAGE, null, TYP.values(), TYP.CSV)
         ) { TYP.CSV }
 
         try {

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@ plugins {`
`6`	`6`	`id 'org.beryx.runtime' version '1.12.7'`
`7`	`7`	`}`
`8`	`8`
	`9`	`+project.description = 'Fügt mehrere Kurswahlen in eine CSV Tabelle zusammen!'`
	`10`	`+`
`9`	`11`	`application {`
`10`	`12`	`mainClass = "${group}.gui.GuiMain"`
`11`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ fun main(args: Array<String>) {`
`131`	`131`	`output = chooser.selectedFile.absolutePath`
`132`	`132`	`}`
`133`	`133`
`134`		`- action = TYP.values().getOrElse(JOptionPane.showOptionDialog(null, "Aktion auswählen", "Auswählen", JOptionPane.DEFAULT_OPTION, JOptionPane.PLAIN_MESSAGE, null, TYP.values(), TYP.CSV)`
	`134`	`+ action = TYP.entries.toTypedArray().getOrElse(JOptionPane.showOptionDialog(null, "Aktion auswählen", "Auswählen", JOptionPane.DEFAULT_OPTION, JOptionPane.PLAIN_MESSAGE, null, TYP.values(), TYP.CSV)`
`135`	`135`	`) { TYP.CSV }`
`136`	`136`
`137`	`137`	`try {`