Improvements for version 2.0.5

pwgit-create · pwgit-create · commit 97ac515b88ed · 2024-07-29T10:18:54.000+02:00
diff --git a/AppWish/AppWish/dependency-reduced-pom.xml b/AppWish/AppWish/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>pn.dev</groupId>
   <artifactId>code-generator-gui-ollama</artifactId>
   <name>CodeGenerator-GUI</name>
-  <version>2.0.4</version>
+  <version>2.0.5</version>
   <description>The GUI interface for the pn.dev.code-generator-ollama library</description>
   <inceptionYear>2024</inceptionYear>
   <developers>
diff --git a/AppWish/AppWish/src/main/java/pn/app_wish/AppWish.java b/AppWish/AppWish/src/main/java/pn/app_wish/AppWish.java
@@ -76,6 +76,7 @@ public class AppWish extends Application {
     private String javaExecutablePath;
     private Process executingJavaAppProcess;
     private boolean isCodeGenerationOnGoing = false;
+    private boolean isSuperAppGeneration = false;
 
     public static void main(String[] args) {
         launch(args);
@@ -114,9 +115,8 @@ private void loadSplashScreen(Stage primaryStage) throws IOException {
 
     @Override
     public void start(Stage primaryStage) throws IOException {
-        System.setProperty(SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "DEBUG");
-        // App Screen
-        //loadDefaultScreen(primaryStage);
+        System.setProperty(SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "INFO");
+
 
         // Splash Screen
         loadSplashScreen(primaryStage);
@@ -129,6 +129,7 @@ public void start(Stage primaryStage) throws IOException {
      */
     private void onAppWish(CodeEvent codeEvent) {
         isCodeGenerationOnGoing = true;
+        output_label.setStyle("-fx-background-color: #00277c; -fx-text-fill: white;");
         // The File Object will be null if it's a new app request or have
         // a value if it is a continuous build from an existing app
         File file;
@@ -151,6 +152,7 @@ private void onAppWish(CodeEvent codeEvent) {
             file = null;
         }
 
+        isSuperAppGeneration = false;
 
         ThreadPoolMaster.getInstance().getExecutor().execute(() -> {
             startGuiThread(codeEvent);
@@ -176,10 +178,11 @@ private void onAppWish(CodeEvent codeEvent) {
     private void onRunJavaApp(ActionEvent ae) {
         btn_run_application.setVisible(false);
         btn_StopGeneratedApp.setVisible(true);
+        output_label.setVisible(false);
 
         if (javaExecutablePath != null) {
 
-            if (!output_label.isVisible()) {
+            if (!isCodeGenerationOnGoing) {
                 log.info("Executing java app on path -> {}", javaExecutablePath);
             }
             try {
@@ -196,8 +199,7 @@ private final ProcessBuilder GetProcessBuilderForRunningGeneratedJavaApplication
 
         final String classPath = javaExecutablePath.replace(MAIN_DOT_JAVA, NOTHING_STRING);
 
-        if (output_label.isVisible()) {
-            // Super App Creation
+        if (isSuperAppGeneration) {
 
             // Security
             if (classPath.concat(MAIN_DOT_JAVA).equals(javaExecutablePath)) {
@@ -342,17 +344,22 @@ private void handleCompilationResult(boolean isSuperGeneration) {
             Platform.runLater(() -> {
                 if (DataStorage.getInstance().getJavaExecutionPath() != null || isSuperGeneration) {
                     if (!isSuperGeneration) {
-                        output_label.setVisible(false);
+
                         btn_run_application.setVisible(true);
+                        output_label.setText(SUCCESS_ON_SUPER_APP_CREATION_TEXT);
+                        output_label.setStyle("-fx-background-color: green; -fx-text-fill: white;");
                     }
                     btn_run_application.setVisible(true);
                     setButtonGroupVisibilityForCodeGenerationButtons(true);
                     isCodeGenerationOnGoing = false;
                     if (isSuperGeneration) {
                         output_label.setText(SUCCESS_ON_SUPER_APP_CREATION_TEXT);
+                        output_label.setStyle("-fx-background-color: green; -fx-text-fill: white;");
+
                     }
                 } else {
-                    output_label.setText("Something went wrong :(");
+                    output_label.setText("Failed! Try again or write an issue report.");
+                    output_label.setStyle("-fx-background-color: red; -fx-text-fill: white;");
                 }
             });
 
@@ -408,6 +415,8 @@ private List<String> readTextByLinesFromFile(File file) {
     public void OnSuperAppCreationButton(ActionEvent ae) {
 
         isCodeGenerationOnGoing = true;
+        isSuperAppGeneration = true;
+        output_label.setStyle("-fx-background-color: #00277c; -fx-text-fill: white;");
         DataStorage.getInstance().setCompilationJob(new CompilationJob(GUIConstants.DEFAULT_STAGE_TITLE));
         ThreadPoolMaster.getInstance().getExecutor().execute(() -> {
             StartGuiThreadForSuperAppCreation();
diff --git a/AppWish/AppWish/src/main/java/pn/app_wish/constant/AboutConstants.java b/AppWish/AppWish/src/main/java/pn/app_wish/constant/AboutConstants.java
@@ -0,0 +1,54 @@
+package pn.app_wish.constant;
+
+
+public record AboutConstants() {
+
+    private static final String APP_WISH_VERSION = "Appwish Enterprise 2.0.5";
+    private static final String ABOUT_APP_WISH = "AppWish (2) is a open source project that creates Java applications from text input with the help of AI models";
+    private static final String DEVELOPED_BY = "Pwgit-Create / Peter Westin";
+    private static final String CONTACT = "\nEmail: snow_900@outlook.com\nIssue Portal at: ";
+    private static final String LINK_TO_DISCUSSION = "link";
+    private static final String LINK_TO_ISSUE_PORTAL="link";
+    private static final String IF_YOU_LIKE_THE_PROJECT = "\n\nIf you like AppWish and wants to show your support ,please let me know by leaving a post at: ";
+    private static final String THANKS_FOR_USING_APP_WISH_ENTERPRISE = "\n\nThanks for taking the time to read the about section, you rock! :)";
+
+
+    /**
+     * Builds an About String that can be used in the About section
+     * @return String
+     */
+    public static String BuildAboutString() {
+
+        return "Version: " +
+                APP_WISH_VERSION +
+                "\n\nWhat is AppWish used for? " +
+                ABOUT_APP_WISH +
+                "\n\nDeveloper: " +
+                DEVELOPED_BY +
+                "\n\nQuestions or in need of support? " +
+                CONTACT +
+                LINK_TO_ISSUE_PORTAL +
+                "\n\nJoin the discussion and see updates: " +
+                LINK_TO_DISCUSSION +
+                IF_YOU_LIKE_THE_PROJECT +
+                THANKS_FOR_USING_APP_WISH_ENTERPRISE;
+
+    }
+
+    /*
+    Get the header text for the about section
+     */
+    public static String GetHeaderText(){
+
+        return "AppWish Enterprise";
+    }
+
+    /*
+    Get the header text for the about section
+     */
+    public static String GetTitleTest(){
+
+        return "About AppWish";
+    }
+
+}
diff --git a/AppWish/AppWish/src/main/java/pn/app_wish/constant/GUIConstants.java b/AppWish/AppWish/src/main/java/pn/app_wish/constant/GUIConstants.java
@@ -1,6 +1,6 @@
 package pn.app_wish.constant;
 
-public class GUIConstants {
+public record GUIConstants() {
 
     public static final String DEFAULT_STAGE_TITLE ="App Wish";
     public static final String DEFAULT_FXML_FILE="start.fxml";
diff --git a/AppWish/AppWish/src/main/java/pn/app_wish/controller/AppHistoryController.java b/AppWish/AppWish/src/main/java/pn/app_wish/controller/AppHistoryController.java
@@ -14,6 +14,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pn.app_wish.AppWish;
+import pn.app_wish.constant.AboutConstants;
 import pn.app_wish.constant.GUIConstants;
 import pn.app_wish.constant.StaticAppWishConstants;
 import pn.app_wish.util.AppWishUtil;
@@ -51,12 +52,16 @@ public class AppHistoryController implements Initializable {
     @FXML
     private Button btnDeleteApp;
 
+    @FXML
+    private Button btnAbout;
+
     private Process executingJavaAppProcess;
 
 
     @Override
     public void initialize(URL url, ResourceBundle resourceBundle) {
         AnchorPane.setRightAnchor(btnMainScene, 0d);
+        AnchorPane.setRightAnchor(btnDeleteApp, 0d);
         AnchorPane.setRightAnchor(btnStopApp, 80d);
         btnStopApp.setVisible(false);
         try {
@@ -163,6 +168,17 @@ private void showConfirmDialogForDeletionOfAnJavaApplication(ActionEvent ae) {
         }
     }
 
+    @FXML
+    private void showAboutMessage(ActionEvent ae) {
+        if (fileListView != null) {
+            Alert alert = new Alert(Alert.AlertType.INFORMATION);
+            alert.setTitle(AboutConstants.GetTitleTest());
+            alert.setHeaderText(AboutConstants.GetHeaderText());
+            alert.setContentText(AboutConstants.BuildAboutString());
+            alert.showAndWait();
+        }
+    }
+
     private void deleteJavaApp(File classFileOfApplication) {
 
         Platform.runLater(() -> {
diff --git a/AppWish/AppWish/src/main/java/pn/app_wish/controller/SplashScreenController.java b/AppWish/AppWish/src/main/java/pn/app_wish/controller/SplashScreenController.java
@@ -40,7 +40,7 @@ public void initialize(URL url, ResourceBundle rb) {
             try {
                 Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getClassLoader().getResource("start.fxml")));
                 Stage mainStage = new Stage();
-                mainStage.setResizable(false);
+                //mainStage.setResizable(false);
                 mainStage.setScene(new Scene(root));
 
                 AppWish.mainStage = mainStage;
diff --git a/AppWish/AppWish/src/main/resources/app_history.fxml b/AppWish/AppWish/src/main/resources/app_history.fxml
@@ -3,12 +3,15 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="pn.app_wish.controller.AppHistoryController">
+<AnchorPane maxHeight="400" maxWidth="592" minHeight="400.0" minWidth="592.0" style="-fx-background-color: #00277c; " xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="pn.app_wish.controller.AppHistoryController">
 
-    <ListView fx:id="fileListView" prefHeight="400.0" prefWidth="200.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" />
-    <Button fx:id="selectButton" layoutX="210.0" layoutY="10.0" mnemonicParsing="false" onAction="#handleSelectButtonAction" style="-fx-background-color: green;" text="Run" textFill="#f8f8f8" />
+    <ListView fx:id="fileListView" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" />
+
+
+    <Button fx:id="selectButton" layoutX="248.0" layoutY="2.0" mnemonicParsing="false" onAction="#handleSelectButtonAction" style="-fx-background-color: #00328c" text="Run" textFill="#f8f8f8" />
     <Button fx:id="btnMainScene" mnemonicParsing="false" onAction="#goToMainScene" style="-fx-background-color: #00328c" text="Back" textFill="WHITE" />
     <Button fx:id="btnStopApp" mnemonicParsing="false" onAction="#stopExecutedJavaApp" style="-fx-background-color: red" text="Stop your app" textFill="WHITE" />
-    <Button fx:id="btnDeleteApp" layoutX="531.0" layoutY="368.0" mnemonicParsing="false" onAction="#showConfirmDialogForDeletionOfAnJavaApplication" style="-fx-background-color:red;" text="Delete" textFill="#f5eef5" />
+    <Button fx:id="btnDeleteApp" layoutX="531.0" layoutY="374.0" onAction="#showConfirmDialogForDeletionOfAnJavaApplication" style="-fx-background-color: #00328c" text="Delete" textFill="#f5eef5" />
+    <Button fx:id="btnAbout" layoutX="248.0" layoutY="374.0" mnemonicParsing="false" onAction="#showAboutMessage" style="-fx-background-color: #00328c" text="About" textFill="#f5eef5" />
 
 </AnchorPane>
diff --git a/AppWish/AppWish/src/main/resources/java_source_code_classes_tmp/Countdown.class b/AppWish/AppWish/src/main/resources/java_source_code_classes_tmp/Countdown.class
diff --git a/AppWish/AppWish/src/main/resources/java_source_code_classes_tmp/Countdown.java b/AppWish/AppWish/src/main/resources/java_source_code_classes_tmp/Countdown.java
@@ -0,0 +1,15 @@
+
+import java.lang.Thread;
+
+public class Countdown {
+    public static void main(String[] args) {
+        for (int i = 10; i >= 0; i--) {
+            System.out.println(i);
+            try {
+                Thread.sleep(1000); // Wait for 1 second
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+} 
diff --git a/AppWish/AppWish/src/main/resources/splashscreen.fxml b/AppWish/AppWish/src/main/resources/splashscreen.fxml
@@ -14,7 +14,7 @@
     </ImageView>
    <Label layoutX="168.0" layoutY="242.0" text="AppWish Enterprise" textFill="WHITE">
       <font>
-         <Font size="36.0" />
+         <Font size="36.0"  name="Arif" />
       </font>
    </Label>
 
diff --git a/AppWish/AppWish/src/main/resources/start.fxml b/AppWish/AppWish/src/main/resources/start.fxml
@@ -5,7 +5,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
 
-<BorderPane xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="pn.app_wish.AppWish">
+<BorderPane minHeight="179" minWidth="400" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="pn.app_wish.AppWish">
     <top>
         <!-- Title Bar -->
         <HBox alignment="CENTER" style="-fx-background-color: #00277c; -fx-padding: 10;">
diff --git a/cg/CodeGenerator/CodeGenerator/dependency-reduced-pom.xml b/cg/CodeGenerator/CodeGenerator/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>pn.dev</groupId>
   <artifactId>code-generator-ollama</artifactId>
-  <version>2.0.4</version>
+  <version>2.0.5</version>
   <description>The Java Application-Generator (pn.dev.code-generator-ollama) creates applications by giving a string of your desired features for a Java application, like this: AppSystem.StartCodeGenerator(String appWish)</description>
   <inceptionYear>2024</inceptionYear>
   <developers>
diff --git a/cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/util/StringUtil.java b/cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/util/StringUtil.java
@@ -292,7 +292,7 @@ public static List<String> GetListOfClassNamesInSuperAppGeneration(String input)
             if(!tmpClassNames.isEmpty() && tmpClassNames.get(0).equalsIgnoreCase(MAIN_CLASS_NAME)){
                 List<String> mutableList = new ArrayList<>(tmpClassNames);
                 Collections.reverse(mutableList);
-                return mutableList;
+                return new LinkedList<>(mutableList);
             }
 
             return tmpClassNames;
