diff --git a/.gitignore b/.gitignore index 7b04d1d..80bd80e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -### Java template -*.class - # Mobile Tools for Java (J2ME) .mtj.tmp/ @@ -74,5 +71,4 @@ crashlytics-build.properties # by github https://github.com/github/gitignore/blob/master/Java.gitignore client/.gradle/ -client/.idea/ client/build/ \ No newline at end of file diff --git a/client/.idea/.gitignore b/client/.idea/.gitignore deleted file mode 100644 index eaf91e2..0000000 --- a/client/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/client/.idea/compiler.xml b/client/.idea/compiler.xml deleted file mode 100644 index 7d7ec2e..0000000 --- a/client/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/client/.idea/gradle.xml b/client/.idea/gradle.xml deleted file mode 100644 index 1797067..0000000 --- a/client/.idea/gradle.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/client/.idea/jarRepositories.xml b/client/.idea/jarRepositories.xml deleted file mode 100644 index 0a1b94d..0000000 --- a/client/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/client/.idea/misc.xml b/client/.idea/misc.xml deleted file mode 100644 index 17d8c2c..0000000 --- a/client/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/client/.idea/runConfigurations.xml b/client/.idea/runConfigurations.xml deleted file mode 100644 index 93e4b17..0000000 --- a/client/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/client/.idea/vcs.xml b/client/.idea/vcs.xml deleted file mode 100644 index 2e3f692..0000000 --- a/client/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/client/build.gradle b/client/build.gradle deleted file mode 100644 index 937fee2..0000000 --- a/client/build.gradle +++ /dev/null @@ -1,43 +0,0 @@ -plugins { - id 'java' - id 'application' - id 'org.openjfx.javafxplugin' version '0.0.10' -} - -group 'com.vpr' -version '1.0-SNAPSHOT' - -repositories { - mavenCentral() -} - -ext { - junitVersion = '5.7.1' -} - -sourceCompatibility = '11' -targetCompatibility = '11' - -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' -} - -application { - mainModule = 'com.vpr.client' - mainClass = 'com.vpr.client.HelloApplication' -} - -javafx { - version = '11.0.2' - modules = ['javafx.controls', 'javafx.fxml'] -} - -dependencies { - - testImplementation("org.junit.jupiter:junit-jupiter-api:${junitVersion}") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitVersion}") -} - -test { - useJUnitPlatform() -} \ No newline at end of file diff --git a/client/gradle/wrapper/gradle-wrapper.jar b/client/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index f3d88b1..0000000 Binary files a/client/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/client/settings.gradle b/client/settings.gradle deleted file mode 100644 index a368696..0000000 --- a/client/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = "client" \ No newline at end of file diff --git a/client/src/main/java/com/vpr/client/HelloController.java b/client/src/main/java/com/vpr/client/HelloController.java deleted file mode 100644 index 496a46d..0000000 --- a/client/src/main/java/com/vpr/client/HelloController.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.vpr.client; - -import javafx.fxml.FXML; -import javafx.scene.control.Label; - -public class HelloController { - @FXML - private Label welcomeText; - - @FXML - protected void onHelloButtonClick() { - welcomeText.setText("Welcome to JavaFX Application!"); - } -} \ No newline at end of file diff --git a/client/src/main/java/module-info.java b/client/src/main/java/module-info.java deleted file mode 100644 index 7453df4..0000000 --- a/client/src/main/java/module-info.java +++ /dev/null @@ -1,8 +0,0 @@ -module com.vpr.client { - requires javafx.controls; - requires javafx.fxml; - - - opens com.vpr.client to javafx.fxml; - exports com.vpr.client; -} \ No newline at end of file diff --git a/client/src/main/resources/com/vpr/client/hello-view.fxml b/client/src/main/resources/com/vpr/client/hello-view.fxml deleted file mode 100644 index 260ef66..0000000 --- a/client/src/main/resources/com/vpr/client/hello-view.fxml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/hellofx/.gradle/6.0/executionHistory/executionHistory.bin b/hellofx/.gradle/6.0/executionHistory/executionHistory.bin new file mode 100644 index 0000000..bda953e Binary files /dev/null and b/hellofx/.gradle/6.0/executionHistory/executionHistory.bin differ diff --git a/hellofx/.gradle/6.0/executionHistory/executionHistory.lock b/hellofx/.gradle/6.0/executionHistory/executionHistory.lock new file mode 100644 index 0000000..5e5171c Binary files /dev/null and b/hellofx/.gradle/6.0/executionHistory/executionHistory.lock differ diff --git a/hellofx/.gradle/6.0/fileChanges/last-build.bin b/hellofx/.gradle/6.0/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/hellofx/.gradle/6.0/fileChanges/last-build.bin differ diff --git a/hellofx/.gradle/6.0/fileContent/fileContent.lock b/hellofx/.gradle/6.0/fileContent/fileContent.lock new file mode 100644 index 0000000..70533a0 Binary files /dev/null and b/hellofx/.gradle/6.0/fileContent/fileContent.lock differ diff --git a/hellofx/.gradle/6.0/fileHashes/fileHashes.bin b/hellofx/.gradle/6.0/fileHashes/fileHashes.bin new file mode 100644 index 0000000..68b7f45 Binary files /dev/null and b/hellofx/.gradle/6.0/fileHashes/fileHashes.bin differ diff --git a/hellofx/.gradle/6.0/fileHashes/fileHashes.lock b/hellofx/.gradle/6.0/fileHashes/fileHashes.lock new file mode 100644 index 0000000..f37572f Binary files /dev/null and b/hellofx/.gradle/6.0/fileHashes/fileHashes.lock differ diff --git a/hellofx/.gradle/6.0/fileHashes/resourceHashesCache.bin b/hellofx/.gradle/6.0/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000..83fb848 Binary files /dev/null and b/hellofx/.gradle/6.0/fileHashes/resourceHashesCache.bin differ diff --git a/hellofx/.gradle/6.0/gc.properties b/hellofx/.gradle/6.0/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/hellofx/.gradle/6.0/javaCompile/classAnalysis.bin b/hellofx/.gradle/6.0/javaCompile/classAnalysis.bin new file mode 100644 index 0000000..0a3f284 Binary files /dev/null and b/hellofx/.gradle/6.0/javaCompile/classAnalysis.bin differ diff --git a/hellofx/.gradle/6.0/javaCompile/jarAnalysis.bin b/hellofx/.gradle/6.0/javaCompile/jarAnalysis.bin new file mode 100644 index 0000000..9ec00c0 Binary files /dev/null and b/hellofx/.gradle/6.0/javaCompile/jarAnalysis.bin differ diff --git a/hellofx/.gradle/6.0/javaCompile/javaCompile.lock b/hellofx/.gradle/6.0/javaCompile/javaCompile.lock new file mode 100644 index 0000000..1a8fd0a Binary files /dev/null and b/hellofx/.gradle/6.0/javaCompile/javaCompile.lock differ diff --git a/hellofx/.gradle/6.0/javaCompile/taskHistory.bin b/hellofx/.gradle/6.0/javaCompile/taskHistory.bin new file mode 100644 index 0000000..03d7624 Binary files /dev/null and b/hellofx/.gradle/6.0/javaCompile/taskHistory.bin differ diff --git a/hellofx/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/hellofx/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..abd86fe Binary files /dev/null and b/hellofx/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/hellofx/.gradle/buildOutputCleanup/cache.properties b/hellofx/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..9c67a3c --- /dev/null +++ b/hellofx/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Sun Nov 14 15:59:12 CET 2021 +gradle.version=6.0 diff --git a/hellofx/.gradle/buildOutputCleanup/outputFiles.bin b/hellofx/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000..705f789 Binary files /dev/null and b/hellofx/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/hellofx/.gradle/vcs-1/gc.properties b/hellofx/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/hellofx/app/build.gradle.kts b/hellofx/app/build.gradle.kts new file mode 100644 index 0000000..a91eaac --- /dev/null +++ b/hellofx/app/build.gradle.kts @@ -0,0 +1,41 @@ + +plugins { + id("application") + id("org.openjfx.javafxplugin") version "0.0.10" +} + +javafx { + version = "11" + modules( + "javafx.controls", + "javafx.fxml" + ) +} + +application { + mainClassName = "client.MainApplication" +} + +dependencies { + implementation(project(":data")) +} + +val jar by tasks.getting(Jar::class) { + manifest { + attributes["Main-Class"] = "client.Launcher" + } + from({ + configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) } + }) +} + +tasks.register("blabla", Copy::class) { + group = "dasdas" + dependsOn("clean") + dependsOn("jar") + + from("$buildDir/libs/app.jar") + + mkdir("$buildDir/newShit/") + into("$buildDir/newShit/") +} diff --git a/hellofx/app/build/resources/main/client/main-view.fxml b/hellofx/app/build/resources/main/client/main-view.fxml new file mode 100644 index 0000000..469829e --- /dev/null +++ b/hellofx/app/build/resources/main/client/main-view.fxml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hellofx/app/src/main/java/client/Launcher.java b/hellofx/app/src/main/java/client/Launcher.java new file mode 100644 index 0000000..d319115 --- /dev/null +++ b/hellofx/app/src/main/java/client/Launcher.java @@ -0,0 +1,8 @@ +package client; + +public class Launcher { + + public static void main(String[] args) { + MainApplication.main(args); + } +} diff --git a/client/src/main/java/com/vpr/client/HelloApplication.java b/hellofx/app/src/main/java/client/MainApplication.java similarity index 59% rename from client/src/main/java/com/vpr/client/HelloApplication.java rename to hellofx/app/src/main/java/client/MainApplication.java index 436db7d..7e64ed6 100644 --- a/client/src/main/java/com/vpr/client/HelloApplication.java +++ b/hellofx/app/src/main/java/client/MainApplication.java @@ -1,20 +1,22 @@ -package com.vpr.client; +package client; import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Scene; import javafx.stage.Stage; +import res.RestController; import java.io.IOException; -public class HelloApplication extends Application { +public class MainApplication extends Application { @Override public void start(Stage stage) throws IOException { - FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("hello-view.fxml")); - Scene scene = new Scene(fxmlLoader.load(), 320, 240); + FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml")); + Scene scene = new Scene(fxmlLoader.load(), 1200, 800); stage.setTitle("Hello!"); stage.setScene(scene); stage.show(); + } public static void main(String[] args) { diff --git a/hellofx/app/src/main/java/client/MainController.java b/hellofx/app/src/main/java/client/MainController.java new file mode 100644 index 0000000..d564c3c --- /dev/null +++ b/hellofx/app/src/main/java/client/MainController.java @@ -0,0 +1,43 @@ +package client; + +import javafx.fxml.FXML; +import javafx.scene.control.Label; +import javafx.scene.layout.GridPane; +import javafx.scene.layout.VBox; +import javafx.scene.paint.Color; +import res.Event; +import res.RestController; + +public class MainController { + @FXML + private GridPane calendarGrid; + + @FXML + private VBox vBoxMon; + @FXML + private VBox vBoxTue; + @FXML + private VBox vBoxWen; + @FXML + private VBox vBoxThu; + @FXML + private VBox vBoxFri; + @FXML + private VBox vBoxSat; + @FXML + private VBox vBoxSun; + + + @FXML + protected void onAddBtnClick(){ + RestController restController = new RestController(); + Event[] eventList = restController.getAllEvents(); + + for(Event event : eventList){ + Label label = new Label(); + label.setText(event.toString()); + label.setTextFill(Color.WHITE); + vBoxWen.getChildren().add(label); + } + } +} \ No newline at end of file diff --git a/hellofx/app/src/main/resources/client/main-view.fxml b/hellofx/app/src/main/resources/client/main-view.fxml new file mode 100644 index 0000000..e3ca47b --- /dev/null +++ b/hellofx/app/src/main/resources/client/main-view.fxml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hellofx/build.gradle.kts b/hellofx/build.gradle.kts new file mode 100644 index 0000000..6e4d8e5 --- /dev/null +++ b/hellofx/build.gradle.kts @@ -0,0 +1,5 @@ +allprojects { + repositories { + mavenCentral() + } +} \ No newline at end of file diff --git a/hellofx/data/build.gradle.kts b/hellofx/data/build.gradle.kts new file mode 100644 index 0000000..5ec7900 --- /dev/null +++ b/hellofx/data/build.gradle.kts @@ -0,0 +1,10 @@ +plugins { + java +} + +dependencies { + + implementation("com.fasterxml.jackson.core:jackson-databind:2.13.0") + implementation("com.fasterxml.jackson.core:jackson-core:2.13.0") + implementation("com.fasterxml.jackson.core:jackson-annotations:2.13.0") +} diff --git a/hellofx/data/build/tmp/jar/MANIFEST.MF b/hellofx/data/build/tmp/jar/MANIFEST.MF new file mode 100644 index 0000000..59499bc --- /dev/null +++ b/hellofx/data/build/tmp/jar/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + diff --git a/hellofx/data/src/main/java/kaka/Dings.java b/hellofx/data/src/main/java/kaka/Dings.java new file mode 100644 index 0000000..92ef67a --- /dev/null +++ b/hellofx/data/src/main/java/kaka/Dings.java @@ -0,0 +1,8 @@ +package kaka; + +public class Dings { + + public static int a() { + return 5; + } +} diff --git a/hellofx/data/src/main/java/res/Event.java b/hellofx/data/src/main/java/res/Event.java new file mode 100644 index 0000000..90a5083 --- /dev/null +++ b/hellofx/data/src/main/java/res/Event.java @@ -0,0 +1,68 @@ +package res; + +public class Event { + + private int id; + private String name; + private int priority; + private boolean isFullDay; + private String start; + private String end; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getPriority() { + return priority; + } + + public void setPriority(int priority) { + this.priority = priority; + } + + public boolean isFullDay() { + return isFullDay; + } + + public void setFullDay(boolean fullDay) { + isFullDay = fullDay; + } + + public String getStart() { + return start; + } + + public void setStart(String start) { + this.start = start; + } + + public String getEnd() { + return end; + } + + public void setEnd(String end) { + this.end = end; + } + + @Override + public String toString() { + return name + + "\nVon: " + start + + "\nBis: " + start + + "\nisFullDay = " + isFullDay; + + } +} diff --git a/hellofx/data/src/main/java/res/RestController.java b/hellofx/data/src/main/java/res/RestController.java new file mode 100644 index 0000000..32978d5 --- /dev/null +++ b/hellofx/data/src/main/java/res/RestController.java @@ -0,0 +1,63 @@ +package res; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.ArrayList; + +public class RestController { + + private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/vpr/all-events"; + private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/vpr/all-users"; + + public Event[] getAllEvents(){ + Event[] eventList = null; + + try { + URL url = new URL(ALL_EVENTS_ENDPOINT); + HttpURLConnection con = (HttpURLConnection) url.openConnection(); + con.setRequestMethod("GET"); + + con.setConnectTimeout(5000); + con.setReadTimeout(5000); + + int status = con.getResponseCode(); + if(status == 200){ + BufferedReader in = new BufferedReader( + new InputStreamReader(con.getInputStream())); + String inputLine; + StringBuilder content = new StringBuilder(); + while ((inputLine = in.readLine()) != null) { + content.append(inputLine); + } + in.close(); + + eventList = parseJsonToEventList(content.toString()); + for (Event e : eventList){ + System.out.println(e); + } + }else{ + System.out.println("Status: " + status); + } + con.disconnect(); + }catch (Exception e){ + e.printStackTrace(); + } + + return eventList; + } + + private Event[] parseJsonToEventList(String jsonString) throws JsonProcessingException { + ArrayList eventList; + + // Parse JSON + ObjectMapper objectMapper = new ObjectMapper(); + //String json = "{ \"color\" : \"Black\", \"type\" : \"BMW\" }"; + + return objectMapper.readValue(jsonString, Event[].class); + } +} diff --git a/client/gradle/wrapper/gradle-wrapper.properties b/hellofx/gradle/wrapper/gradle-wrapper.properties similarity index 80% rename from client/gradle/wrapper/gradle-wrapper.properties rename to hellofx/gradle/wrapper/gradle-wrapper.properties index 05679dc..63e1207 100644 --- a/client/gradle/wrapper/gradle-wrapper.properties +++ b/hellofx/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Tue Nov 15 11:51:46 CET 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip diff --git a/client/gradlew b/hellofx/gradlew similarity index 64% rename from client/gradlew rename to hellofx/gradlew index 4f906e0..9d82f78 100644 --- a/client/gradlew +++ b/hellofx/gradlew @@ -1,20 +1,4 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# +#!/usr/bin/env bash ############################################################################## ## @@ -22,6 +6,42 @@ ## ############################################################################## +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + # Attempt to set APP_HOME # Resolve links: $0 may be a link PRG="$0" @@ -40,49 +60,8 @@ cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -106,7 +85,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -126,11 +105,10 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath @@ -156,30 +134,27 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then else eval `echo args$i`="\"$arg\"" fi - i=`expr $i + 1` + i=$((i+1)) done case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") } -APP_ARGS=`save "$@"` +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/client/gradlew.bat b/hellofx/gradlew.bat similarity index 64% rename from client/gradlew.bat rename to hellofx/gradlew.bat index ac1b06f..8a0b282 100644 --- a/client/gradlew.bat +++ b/hellofx/gradlew.bat @@ -1,89 +1,90 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/hellofx/settings.gradle.kts b/hellofx/settings.gradle.kts new file mode 100644 index 0000000..c43cf6e --- /dev/null +++ b/hellofx/settings.gradle.kts @@ -0,0 +1,2 @@ +include("app") +include("data")