Fix Import and improve Select

Author: Lauriichan

pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>me.lauriichan.school</groupId>
 	<artifactId>compile</artifactId>
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 
 	<repositories>
 		<repository>

src/main/java/me/lauriichan/school/compile/project/Project.java

@@ -182,6 +182,11 @@ public void println(String line) {
 
     public boolean compile() {
         if (!isCompileable()) {
+            ConsoleView.APP_LOG.ifPresent(log -> {
+                log.warn("Das Projekt '" + name + "' kann nicht kompiliert werden,");
+                log.warn("da es kein normales Java Projekt ist!");
+            });
+            Main.SELECT.ifPresent(consumer -> consumer.accept(3));
             return false;
         }
         Executor.execute(() -> Singleton.get(ProjectCompiler.class).compile(this));
@@ -191,7 +196,7 @@ public boolean compile() {
     public boolean execute() {
         if (RUNNING) {
             ConsoleView.APP_LOG.ifPresent(log -> {
-                log.error("Projekt '" + name + "' konnt nicht ausgeführt werden,");
+                log.error("Das Projekt '" + name + "' konnt nicht ausgeführt werden,");
                 log.error("da ein Projekt bereits ausgeführt wird!");
             });
             Main.SELECT.ifPresent(consumer -> consumer.accept(3));

src/main/java/me/lauriichan/school/compile/window/ui/component/RadioList.java

@@ -344,8 +344,8 @@ public void setCurrent(int current) {
                 button.press();
             }
         }
-        this.current = Math.min(components.size(), Math.max(0, current));
-        if (this.current == components.size()) {
+        this.current = Math.min(components.size(), Math.max(-1, current));
+        if (this.current == components.size() || this.current == -1) {
             return;
         }
         RadioButton button = components.get(this.current);

src/main/java/me/lauriichan/school/compile/window/view/MainView.java

@@ -161,6 +161,24 @@ public void removeProject(String name) {
         }
     }
 
+    public void selectProject(String name) {
+        Component component = pane.getChild(0);
+        if (component == null || !(component instanceof RadioList)) {
+            return;
+        }
+        RadioList list = (RadioList) component;
+        RadioButton[] buttons = list.getChildren();
+        for (int index = 0; index < buttons.length; index++) {
+            String btnName = buttons[index].getText().split("\n", 2)[0];
+            if (!name.equals(btnName)) {
+                continue;
+            }
+            list.setCurrent(-1);
+            list.setCurrent(index);
+            break;
+        }
+    }
+
     public void exportProject(Project project) {
         JnaFileChooser chooser = new JnaFileChooser();
         chooser.setMultiSelectionEnabled(false);
@@ -245,11 +263,16 @@ public void importProject() {
             FileUtils.copyDirectory(folder, output);
             FileUtils.deleteDirectory(folder);
             Project.create(project.getName(), project.getPacket(), output, null);
-            project = Project.get(project.getName());
-            if(project == null) {
+            Project tmpProject = Project.get(project.getName());
+            if (tmpProject == null) {
                 return;
             }
-            project.open();
+            tmpProject.getOptions().addAll(project.getOptions());
+            addProject(tmpProject);
+            selectProject(tmpProject.getName());
+            Project.setDefault(tmpProject);
+            Singleton.get(Settings.class).save();
+            tmpProject.open();
         });
     }
 
@@ -263,7 +286,7 @@ private void fillList(RadioList list) {
             if (project == null) {
                 continue;
             }
-            if(!project.getDirectory().exists()) {
+            if (!project.getDirectory().exists()) {
                 Project.PROJECTS.delete(Singleton.get(Settings.class), project.getName());
                 continue;
             }

src/main/java/me/lauriichan/school/compile/window/view/TemplateView.java

@@ -12,10 +12,12 @@
 
 import jnafilechooser.api.JnaFileChooser;
 import jnafilechooser.api.JnaFileChooser.Mode;
+import me.lauriichan.school.compile.data.Settings;
 import me.lauriichan.school.compile.project.Project;
 import me.lauriichan.school.compile.project.ProjectInfo;
 import me.lauriichan.school.compile.project.template.Template;
 import me.lauriichan.school.compile.util.Executor;
+import me.lauriichan.school.compile.util.Singleton;
 import me.lauriichan.school.compile.window.input.mouse.MouseButton;
 import me.lauriichan.school.compile.window.ui.BasicPane;
 import me.lauriichan.school.compile.window.ui.Component;
@@ -126,12 +128,16 @@ private void createProject(Boolean state, Object input, Template template) {
         if (project == null) {
             return;
         }
+        Project.setDefault(project);
         Executor.execute(() -> project.open());
+        Singleton.get(Settings.class).save();
         if (existed) {
             main.updateProject(project);
+            main.selectProject(project.getName());
             return;
         }
         main.addProject(project);
+        main.selectProject(project.getName());
     }
 
     public void setButtonLocked(boolean locked) {