diff --git a/.gitpod.yml b/.gitpod.yml index 5f670c222483577a315fe8610e1804d8d27d09a0..e099a000b774de55b4577ef0f366144f7c430fd2 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -3,7 +3,7 @@ image: tasks: - init: sdk use java 14.0.2.j9-adpt - command: cd javafx-app + command: cd Valutakalkulator ports: # used by virtual desktop and vnc, supports JavaFX diff --git a/.theia/tasks.json b/.theia/tasks.json new file mode 100644 index 0000000000000000000000000000000000000000..4622896cab27a2db48fce7921b8473437da6b594 --- /dev/null +++ b/.theia/tasks.json @@ -0,0 +1,19 @@ +{ + // See https://go.microsoft.com/fwlink/?LinkId=733558 + // for the documentation about the tasks.json format + "version": "2.0.0", + "tasks": [ + { + "label": "verify", + "type": "shell", + "command": "mvn -B verify", + "group": "build" + }, + { + "label": "test", + "type": "shell", + "command": "mvn -B test", + "group": "test" + } + ] +} \ No newline at end of file diff --git a/Valutakalkulator/.classpath b/Valutakalkulator/.classpath new file mode 100644 index 0000000000000000000000000000000000000000..fc215020258ee312c8b708d328c270226c96bbac --- /dev/null +++ b/Valutakalkulator/.classpath @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry including="**/*.java" kind="src" output="target/classes" path="src"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="test"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-13"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" path="target/generated-sources/annotations"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + <attribute name="ignore_optional_problems" value="true"/> + <attribute name="m2e-apt" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + <attribute name="ignore_optional_problems" value="true"/> + <attribute name="m2e-apt" value="true"/> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="target/classes"/> +</classpath> diff --git a/Valutakalkulator/.project b/Valutakalkulator/.project new file mode 100644 index 0000000000000000000000000000000000000000..95c18c267339c3204fca08cd5fd0ed0ef0b5fc33 --- /dev/null +++ b/Valutakalkulator/.project @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>Valutakalkulator</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + </natures> +</projectDescription> diff --git a/javafx-app/pom.xml b/Valutakalkulator/pom.xml similarity index 96% rename from javafx-app/pom.xml rename to Valutakalkulator/pom.xml index 9d006861254ac34127746e5f21214713ef1600c9..91f92b1aa76895e7bc62f97381d99f59478372cc 100644 --- a/javafx-app/pom.xml +++ b/Valutakalkulator/pom.xml @@ -3,7 +3,7 @@ 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>it1901</groupId> - <artifactId>javafx-app</artifactId> + <artifactId>Valutakalkulator</artifactId> <version>0.0.1-SNAPSHOT</version> <dependencies> @@ -97,7 +97,7 @@ <artifactId>javafx-maven-plugin</artifactId> <version>0.0.4</version> <configuration> - <mainClass>javafxapp.App</mainClass> + <mainClass>Valutakalkulator.App</mainClass> </configuration> </plugin> </plugins> diff --git a/javafx-app/src/javafxapp/App.fxml b/Valutakalkulator/src/Valutakalkulator/App.fxml similarity index 70% rename from javafx-app/src/javafxapp/App.fxml rename to Valutakalkulator/src/Valutakalkulator/App.fxml index 94cfdfa19d44537bbdaec8102c9c4fea50f0eddb..406aa03e07424e753d874ffc6b27432e7ee5df54 100644 --- a/javafx-app/src/javafxapp/App.fxml +++ b/Valutakalkulator/src/Valutakalkulator/App.fxml @@ -3,6 +3,6 @@ <?import javafx.scene.layout.Pane?> <?import javafx.scene.control.Button?> -<Pane xmlns:fx="http://javafx.com/fxml/1" fx:controller="javafxapp.AppController"> +<Pane xmlns:fx="http://javafx.com/fxml/1" fx:controller="Valutakalkulator.AppController"> <Button fx:id="clickMeButton" text="Click me!" onAction="#handleClickMeButtonAction"/> </Pane> diff --git a/javafx-app/src/javafxapp/App.java b/Valutakalkulator/src/Valutakalkulator/App.java similarity index 95% rename from javafx-app/src/javafxapp/App.java rename to Valutakalkulator/src/Valutakalkulator/App.java index ca72d4a985956335cdfd8f5928bda4eca2e94f0c..7e578fddc97cba278cfb2b5881964018cb819dbd 100644 --- a/javafx-app/src/javafxapp/App.java +++ b/Valutakalkulator/src/Valutakalkulator/App.java @@ -1,4 +1,4 @@ -package javafxapp; +package Valutakalkulator; import javafx.application.Application; import javafx.fxml.FXMLLoader; diff --git a/javafx-app/src/javafxapp/AppController.java b/Valutakalkulator/src/Valutakalkulator/AppController.java similarity index 89% rename from javafx-app/src/javafxapp/AppController.java rename to Valutakalkulator/src/Valutakalkulator/AppController.java index fc0d9b88616f8a94f0d6bbcd6ee1a6c9f5e9895d..4efe320c12e6c4ee0c9545e813c743deff19dfb9 100644 --- a/javafx-app/src/javafxapp/AppController.java +++ b/Valutakalkulator/src/Valutakalkulator/AppController.java @@ -1,4 +1,4 @@ -package javafxapp; +package Valutakalkulator; import javafx.fxml.FXML; import javafx.scene.control.Button; diff --git a/javafx-app/src/javafxapp/Main.java b/Valutakalkulator/src/Valutakalkulator/Main.java similarity index 96% rename from javafx-app/src/javafxapp/Main.java rename to Valutakalkulator/src/Valutakalkulator/Main.java index 98b24c54ae9388308016e074a868246849109416..b8d684d1857847cac9106d9d3f766d9f6a787650 100644 --- a/javafx-app/src/javafxapp/Main.java +++ b/Valutakalkulator/src/Valutakalkulator/Main.java @@ -1,4 +1,4 @@ -package application; +package Valutakalkulator; import javafx.application.Application; import javafx.fxml.FXMLLoader; diff --git a/javafx-app/src/javafxapp/ValutaKalkulator.fxml b/Valutakalkulator/src/Valutakalkulator/ValutaKalkulator.fxml similarity index 96% rename from javafx-app/src/javafxapp/ValutaKalkulator.fxml rename to Valutakalkulator/src/Valutakalkulator/ValutaKalkulator.fxml index 497121117e6df62636bd4cd822fcfc838c3eb5bf..77f912349317d089d95b07480427915d1dd60eb9 100644 --- a/javafx-app/src/javafxapp/ValutaKalkulator.fxml +++ b/Valutakalkulator/src/Valutakalkulator/ValutaKalkulator.fxml @@ -10,7 +10,7 @@ <?import javafx.scene.text.Font?> <?import javafx.scene.text.Text?> -<AnchorPane xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.ValutaKalkulatorController"> +<AnchorPane xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="Valutakalkulator.ValutaKalkulatorController"> <children> <BorderPane prefHeight="325.0" prefWidth="435.0"> <top> diff --git a/javafx-app/src/javafxapp/ValutaKalkulator.java b/Valutakalkulator/src/Valutakalkulator/ValutaKalkulator.java similarity index 94% rename from javafx-app/src/javafxapp/ValutaKalkulator.java rename to Valutakalkulator/src/Valutakalkulator/ValutaKalkulator.java index b1c9a2d08f3b1213b474b1404496a6f4493999fc..6a3c7209cc2ebb195e9cf63ac3d8b039f3a9e548 100644 --- a/javafx-app/src/javafxapp/ValutaKalkulator.java +++ b/Valutakalkulator/src/Valutakalkulator/ValutaKalkulator.java @@ -1,4 +1,4 @@ -package application; +package Valutakalkulator; import java.util.Hashtable; diff --git a/javafx-app/src/javafxapp/ValutaKalkulatorController.java b/Valutakalkulator/src/Valutakalkulator/ValutaKalkulatorController.java similarity index 97% rename from javafx-app/src/javafxapp/ValutaKalkulatorController.java rename to Valutakalkulator/src/Valutakalkulator/ValutaKalkulatorController.java index f04fbf8382f455038db2d57c4239a12a3baa81fc..0c3dedbb4849b4cc704a9eb292f66e2b68c93e7a 100644 --- a/javafx-app/src/javafxapp/ValutaKalkulatorController.java +++ b/Valutakalkulator/src/Valutakalkulator/ValutaKalkulatorController.java @@ -1,4 +1,4 @@ -package application; +package Valutakalkulator; diff --git a/javafx-app/test/javafxapp/AppTest.java b/Valutakalkulator/test/Valutakalkulator/AppTest.java similarity index 97% rename from javafx-app/test/javafxapp/AppTest.java rename to Valutakalkulator/test/Valutakalkulator/AppTest.java index 3dbf899eadc887cbc2d48df66b33cb7c1e801295..e74772c268e8b41712b48cf225b2a927a51e58f8 100644 --- a/javafx-app/test/javafxapp/AppTest.java +++ b/Valutakalkulator/test/Valutakalkulator/AppTest.java @@ -1,4 +1,4 @@ -package javafxapp; +package Valutakalkulator; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/javafx-app/src/javafxapp/application.css b/javafx-app/src/javafxapp/application.css deleted file mode 100644 index 83d6f3343843c65d5dfaf3fedb97b6494c19113d..0000000000000000000000000000000000000000 --- a/javafx-app/src/javafxapp/application.css +++ /dev/null @@ -1 +0,0 @@ -/* JavaFX CSS - Leave this comment until you have at least create one rule which uses -fx-Property */ \ No newline at end of file diff --git a/javafx-app/src/module-info.java b/javafx-app/src/module-info.java deleted file mode 100644 index f101e537a5c52ff3270507540bed21143173f515..0000000000000000000000000000000000000000 --- a/javafx-app/src/module-info.java +++ /dev/null @@ -1,9 +0,0 @@ -module javafxapp { - requires javafx.fxml; - requires transitive javafx.graphics; - requires javafx.controls; - - exports javafxapp; - - opens javafxapp to javafx.fxml; -} \ No newline at end of file