Complete rewrite/restructure of the project
This commit is contained in:
parent
22618081ee
commit
96e0853d20
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,6 +1,3 @@
|
|||||||
### Java template
|
|
||||||
*.class
|
|
||||||
|
|
||||||
# Mobile Tools for Java (J2ME)
|
# Mobile Tools for Java (J2ME)
|
||||||
.mtj.tmp/
|
.mtj.tmp/
|
||||||
|
|
||||||
@ -74,5 +71,4 @@ crashlytics-build.properties
|
|||||||
# by github https://github.com/github/gitignore/blob/master/Java.gitignore
|
# by github https://github.com/github/gitignore/blob/master/Java.gitignore
|
||||||
|
|
||||||
client/.gradle/
|
client/.gradle/
|
||||||
client/.idea/
|
|
||||||
client/build/
|
client/build/
|
||||||
3
client/.idea/.gitignore
generated
vendored
3
client/.idea/.gitignore
generated
vendored
@ -1,3 +0,0 @@
|
|||||||
# Default ignored files
|
|
||||||
/shelf/
|
|
||||||
/workspace.xml
|
|
||||||
6
client/.idea/compiler.xml
generated
6
client/.idea/compiler.xml
generated
@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="CompilerConfiguration">
|
|
||||||
<bytecodeTargetLevel target="11" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
16
client/.idea/gradle.xml
generated
16
client/.idea/gradle.xml
generated
@ -1,16 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="GradleSettings">
|
|
||||||
<option name="linkedExternalProjectsSettings">
|
|
||||||
<GradleProjectSettings>
|
|
||||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
|
||||||
<option name="modules">
|
|
||||||
<set>
|
|
||||||
<option value="$PROJECT_DIR$" />
|
|
||||||
</set>
|
|
||||||
</option>
|
|
||||||
</GradleProjectSettings>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
20
client/.idea/jarRepositories.xml
generated
20
client/.idea/jarRepositories.xml
generated
@ -1,20 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="RemoteRepositoriesConfiguration">
|
|
||||||
<remote-repository>
|
|
||||||
<option name="id" value="central" />
|
|
||||||
<option name="name" value="Maven Central repository" />
|
|
||||||
<option name="url" value="https://repo1.maven.org/maven2" />
|
|
||||||
</remote-repository>
|
|
||||||
<remote-repository>
|
|
||||||
<option name="id" value="jboss.community" />
|
|
||||||
<option name="name" value="JBoss Community repository" />
|
|
||||||
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
|
||||||
</remote-repository>
|
|
||||||
<remote-repository>
|
|
||||||
<option name="id" value="MavenRepo" />
|
|
||||||
<option name="name" value="MavenRepo" />
|
|
||||||
<option name="url" value="https://repo.maven.apache.org/maven2/" />
|
|
||||||
</remote-repository>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
7
client/.idea/misc.xml
generated
7
client/.idea/misc.xml
generated
@ -1,7 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
|
|
||||||
<output url="file://$PROJECT_DIR$/out" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
10
client/.idea/runConfigurations.xml
generated
10
client/.idea/runConfigurations.xml
generated
@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="RunConfigurationProducerService">
|
|
||||||
<option name="ignoredProducers">
|
|
||||||
<set>
|
|
||||||
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
|
|
||||||
</set>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
6
client/.idea/vcs.xml
generated
6
client/.idea/vcs.xml
generated
@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="VcsDirectoryMappings">
|
|
||||||
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@ -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()
|
|
||||||
}
|
|
||||||
BIN
client/gradle/wrapper/gradle-wrapper.jar
vendored
BIN
client/gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
@ -1 +0,0 @@
|
|||||||
rootProject.name = "client"
|
|
||||||
@ -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!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -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;
|
|
||||||
}
|
|
||||||
@ -1,99 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
|
|
||||||
<?import javafx.geometry.Insets?>
|
|
||||||
<?import javafx.scene.layout.*?>
|
|
||||||
<?import javafx.scene.image.*?>
|
|
||||||
<?import javafx.scene.control.*?>
|
|
||||||
|
|
||||||
<GridPane gridLinesVisible="true" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1">
|
|
||||||
<columnConstraints>
|
|
||||||
<ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0" />
|
|
||||||
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
|
|
||||||
</columnConstraints>
|
|
||||||
<rowConstraints>
|
|
||||||
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
|
|
||||||
</rowConstraints>
|
|
||||||
<children>
|
|
||||||
<VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0" style="-fx-background-color: #333333;">
|
|
||||||
<children>
|
|
||||||
<ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
|
|
||||||
</ImageView>
|
|
||||||
<Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;" textAlignment="CENTER" textFill="WHITE">
|
|
||||||
ADD
|
|
||||||
</Button>
|
|
||||||
<Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;" textAlignment="CENTER" textFill="WHITE">
|
|
||||||
ADD
|
|
||||||
</Button>
|
|
||||||
<Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;" textAlignment="CENTER" textFill="WHITE">
|
|
||||||
ADD
|
|
||||||
</Button>
|
|
||||||
</children>
|
|
||||||
</VBox>
|
|
||||||
<GridPane gridLinesVisible="true" GridPane.columnIndex="1">
|
|
||||||
<columnConstraints>
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" />
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" />
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" />
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" />
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" />
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" />
|
|
||||||
<ColumnConstraints hgrow="ALWAYS" />
|
|
||||||
</columnConstraints>
|
|
||||||
<rowConstraints>
|
|
||||||
<RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER" />
|
|
||||||
<RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER" />
|
|
||||||
<RowConstraints vgrow="ALWAYS" />
|
|
||||||
</rowConstraints>
|
|
||||||
<children>
|
|
||||||
<Label textFill="WHITE">
|
|
||||||
Monat
|
|
||||||
<padding>
|
|
||||||
<Insets left="5" />
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
<Label textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="1">
|
|
||||||
Mo
|
|
||||||
<padding>
|
|
||||||
<Insets left="5" />
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
<Label textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="1">
|
|
||||||
Di
|
|
||||||
<padding>
|
|
||||||
<Insets left="5" />
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
<Label textFill="WHITE" GridPane.columnIndex="2" GridPane.rowIndex="1">
|
|
||||||
Mi
|
|
||||||
<padding>
|
|
||||||
<Insets left="5" />
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
<Label textFill="WHITE" GridPane.columnIndex="3" GridPane.rowIndex="1">
|
|
||||||
Do
|
|
||||||
<padding>
|
|
||||||
<Insets left="5" />
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
<Label textFill="WHITE" GridPane.columnIndex="4" GridPane.rowIndex="1">
|
|
||||||
Fr
|
|
||||||
<padding>
|
|
||||||
<Insets left="5" />
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
<Label textFill="WHITE" GridPane.columnIndex="5" GridPane.rowIndex="1">
|
|
||||||
Sa
|
|
||||||
<padding>
|
|
||||||
<Insets left="5" />
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
<Label textFill="WHITE" GridPane.columnIndex="6" GridPane.rowIndex="1">
|
|
||||||
So
|
|
||||||
<padding>
|
|
||||||
<Insets left="5" />
|
|
||||||
</padding>
|
|
||||||
</Label>
|
|
||||||
</children>
|
|
||||||
</GridPane>
|
|
||||||
</children>
|
|
||||||
</GridPane>
|
|
||||||
BIN
hellofx/.gradle/6.0/executionHistory/executionHistory.bin
Normal file
BIN
hellofx/.gradle/6.0/executionHistory/executionHistory.bin
Normal file
Binary file not shown.
BIN
hellofx/.gradle/6.0/executionHistory/executionHistory.lock
Normal file
BIN
hellofx/.gradle/6.0/executionHistory/executionHistory.lock
Normal file
Binary file not shown.
BIN
hellofx/.gradle/6.0/fileChanges/last-build.bin
Normal file
BIN
hellofx/.gradle/6.0/fileChanges/last-build.bin
Normal file
Binary file not shown.
BIN
hellofx/.gradle/6.0/fileContent/fileContent.lock
Normal file
BIN
hellofx/.gradle/6.0/fileContent/fileContent.lock
Normal file
Binary file not shown.
BIN
hellofx/.gradle/6.0/fileHashes/fileHashes.bin
Normal file
BIN
hellofx/.gradle/6.0/fileHashes/fileHashes.bin
Normal file
Binary file not shown.
BIN
hellofx/.gradle/6.0/fileHashes/fileHashes.lock
Normal file
BIN
hellofx/.gradle/6.0/fileHashes/fileHashes.lock
Normal file
Binary file not shown.
BIN
hellofx/.gradle/6.0/fileHashes/resourceHashesCache.bin
Normal file
BIN
hellofx/.gradle/6.0/fileHashes/resourceHashesCache.bin
Normal file
Binary file not shown.
0
hellofx/.gradle/6.0/gc.properties
Normal file
0
hellofx/.gradle/6.0/gc.properties
Normal file
BIN
hellofx/.gradle/6.0/javaCompile/classAnalysis.bin
Normal file
BIN
hellofx/.gradle/6.0/javaCompile/classAnalysis.bin
Normal file
Binary file not shown.
BIN
hellofx/.gradle/6.0/javaCompile/jarAnalysis.bin
Normal file
BIN
hellofx/.gradle/6.0/javaCompile/jarAnalysis.bin
Normal file
Binary file not shown.
BIN
hellofx/.gradle/6.0/javaCompile/javaCompile.lock
Normal file
BIN
hellofx/.gradle/6.0/javaCompile/javaCompile.lock
Normal file
Binary file not shown.
BIN
hellofx/.gradle/6.0/javaCompile/taskHistory.bin
Normal file
BIN
hellofx/.gradle/6.0/javaCompile/taskHistory.bin
Normal file
Binary file not shown.
BIN
hellofx/.gradle/buildOutputCleanup/buildOutputCleanup.lock
Normal file
BIN
hellofx/.gradle/buildOutputCleanup/buildOutputCleanup.lock
Normal file
Binary file not shown.
2
hellofx/.gradle/buildOutputCleanup/cache.properties
Normal file
2
hellofx/.gradle/buildOutputCleanup/cache.properties
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
#Sun Nov 14 15:59:12 CET 2021
|
||||||
|
gradle.version=6.0
|
||||||
BIN
hellofx/.gradle/buildOutputCleanup/outputFiles.bin
Normal file
BIN
hellofx/.gradle/buildOutputCleanup/outputFiles.bin
Normal file
Binary file not shown.
0
hellofx/.gradle/vcs-1/gc.properties
Normal file
0
hellofx/.gradle/vcs-1/gc.properties
Normal file
41
hellofx/app/build.gradle.kts
Normal file
41
hellofx/app/build.gradle.kts
Normal file
@ -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/")
|
||||||
|
}
|
||||||
133
hellofx/app/build/resources/main/client/main-view.fxml
Normal file
133
hellofx/app/build/resources/main/client/main-view.fxml
Normal file
@ -0,0 +1,133 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<?import javafx.geometry.*?>
|
||||||
|
<?import javafx.scene.*?>
|
||||||
|
<?import javafx.scene.control.*?>
|
||||||
|
<?import javafx.scene.image.*?>
|
||||||
|
<?import javafx.scene.layout.*?>
|
||||||
|
|
||||||
|
<GridPane gridLinesVisible="true" style="-fx-background-color: #424242;"
|
||||||
|
xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1"
|
||||||
|
fx:controller="client.MainController">
|
||||||
|
<columnConstraints>
|
||||||
|
<ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0"/>
|
||||||
|
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
|
||||||
|
</columnConstraints>
|
||||||
|
<rowConstraints>
|
||||||
|
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
|
||||||
|
</rowConstraints>
|
||||||
|
<VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0"
|
||||||
|
style="-fx-background-color: #333333;">
|
||||||
|
<ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
|
||||||
|
</ImageView>
|
||||||
|
<Button mnemonicParsing="false" onAction="#onAddBtnClick" prefHeight="50" prefWidth="50"
|
||||||
|
style="-fx-background-color: #424242;" text="ADD" textAlignment="CENTER" textFill="WHITE">
|
||||||
|
<cursor>
|
||||||
|
<Cursor fx:constant="HAND"/>
|
||||||
|
</cursor>
|
||||||
|
</Button>
|
||||||
|
<Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;"
|
||||||
|
textAlignment="CENTER" textFill="WHITE">
|
||||||
|
ADD
|
||||||
|
<cursor>
|
||||||
|
<Cursor fx:constant="HAND"/>
|
||||||
|
</cursor>
|
||||||
|
</Button>
|
||||||
|
<Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;"
|
||||||
|
textAlignment="CENTER" textFill="WHITE">
|
||||||
|
ADD
|
||||||
|
<cursor>
|
||||||
|
<Cursor fx:constant="HAND"/>
|
||||||
|
</cursor>
|
||||||
|
</Button>
|
||||||
|
</VBox>
|
||||||
|
<GridPane fx:id="calendarGrid" gridLinesVisible="true" GridPane.columnIndex="1">
|
||||||
|
<columnConstraints>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
||||||
|
</columnConstraints>
|
||||||
|
<rowConstraints>
|
||||||
|
<RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER"/>
|
||||||
|
<RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER"/>
|
||||||
|
<RowConstraints vgrow="ALWAYS"/>
|
||||||
|
</rowConstraints>
|
||||||
|
<children>
|
||||||
|
<Label textFill="WHITE">
|
||||||
|
Monat
|
||||||
|
<padding>
|
||||||
|
<Insets left="5"/>
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
|
||||||
|
<Label textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="1">
|
||||||
|
Mo
|
||||||
|
<padding>
|
||||||
|
<Insets left="5"/>
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
<Label textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="1">
|
||||||
|
Di
|
||||||
|
<padding>
|
||||||
|
<Insets left="5"/>
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
<Label textFill="WHITE" GridPane.columnIndex="2" GridPane.rowIndex="1">
|
||||||
|
Mi
|
||||||
|
<padding>
|
||||||
|
<Insets left="5"/>
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
<Label textFill="WHITE" GridPane.columnIndex="3" GridPane.rowIndex="1">
|
||||||
|
Do
|
||||||
|
<padding>
|
||||||
|
<Insets left="5"/>
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
<Label textFill="WHITE" GridPane.columnIndex="4" GridPane.rowIndex="1">
|
||||||
|
Fr
|
||||||
|
<padding>
|
||||||
|
<Insets left="5"/>
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
<Label textFill="WHITE" GridPane.columnIndex="5" GridPane.rowIndex="1">
|
||||||
|
Sa
|
||||||
|
<padding>
|
||||||
|
<Insets left="5"/>
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
<Label textFill="WHITE" GridPane.columnIndex="6" GridPane.rowIndex="1">
|
||||||
|
So
|
||||||
|
<padding>
|
||||||
|
<Insets left="5"/>
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
|
||||||
|
<VBox fx:id="vBoxMon" spacing="5.0" GridPane.columnIndex="0" GridPane.rowIndex="2">
|
||||||
|
|
||||||
|
</VBox>
|
||||||
|
<VBox fx:id="vBoxTue" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
|
||||||
|
|
||||||
|
</VBox>
|
||||||
|
<VBox fx:id="vBoxWen" spacing="5.0" GridPane.columnIndex="2" GridPane.rowIndex="2">
|
||||||
|
|
||||||
|
</VBox>
|
||||||
|
<VBox fx:id="vBoxThu" spacing="5.0" GridPane.columnIndex="3" GridPane.rowIndex="2">
|
||||||
|
|
||||||
|
</VBox>
|
||||||
|
<VBox fx:id="vBoxFri" spacing="5.0" GridPane.columnIndex="4" GridPane.rowIndex="2">
|
||||||
|
|
||||||
|
</VBox>
|
||||||
|
<VBox fx:id="vBoxSat" spacing="5.0" GridPane.columnIndex="5" GridPane.rowIndex="2">
|
||||||
|
|
||||||
|
</VBox>
|
||||||
|
<VBox fx:id="vBoxSun" spacing="5.0" GridPane.columnIndex="6" GridPane.rowIndex="2">
|
||||||
|
|
||||||
|
</VBox>
|
||||||
|
</children>
|
||||||
|
</GridPane>
|
||||||
|
</GridPane>
|
||||||
8
hellofx/app/src/main/java/client/Launcher.java
Normal file
8
hellofx/app/src/main/java/client/Launcher.java
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
package client;
|
||||||
|
|
||||||
|
public class Launcher {
|
||||||
|
|
||||||
|
public static void main(String[] args) {
|
||||||
|
MainApplication.main(args);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,20 +1,22 @@
|
|||||||
package com.vpr.client;
|
package client;
|
||||||
|
|
||||||
import javafx.application.Application;
|
import javafx.application.Application;
|
||||||
import javafx.fxml.FXMLLoader;
|
import javafx.fxml.FXMLLoader;
|
||||||
import javafx.scene.Scene;
|
import javafx.scene.Scene;
|
||||||
import javafx.stage.Stage;
|
import javafx.stage.Stage;
|
||||||
|
import res.RestController;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
public class HelloApplication extends Application {
|
public class MainApplication extends Application {
|
||||||
@Override
|
@Override
|
||||||
public void start(Stage stage) throws IOException {
|
public void start(Stage stage) throws IOException {
|
||||||
FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("hello-view.fxml"));
|
FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml"));
|
||||||
Scene scene = new Scene(fxmlLoader.load(), 320, 240);
|
Scene scene = new Scene(fxmlLoader.load(), 1200, 800);
|
||||||
stage.setTitle("Hello!");
|
stage.setTitle("Hello!");
|
||||||
stage.setScene(scene);
|
stage.setScene(scene);
|
||||||
stage.show();
|
stage.show();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
43
hellofx/app/src/main/java/client/MainController.java
Normal file
43
hellofx/app/src/main/java/client/MainController.java
Normal file
@ -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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
131
hellofx/app/src/main/resources/client/main-view.fxml
Normal file
131
hellofx/app/src/main/resources/client/main-view.fxml
Normal file
@ -0,0 +1,131 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<?import javafx.geometry.*?>
|
||||||
|
<?import javafx.scene.*?>
|
||||||
|
<?import javafx.scene.control.*?>
|
||||||
|
<?import javafx.scene.image.*?>
|
||||||
|
<?import javafx.scene.layout.*?>
|
||||||
|
|
||||||
|
<GridPane gridLinesVisible="true" style="-fx-background-color: #424242;"
|
||||||
|
xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1"
|
||||||
|
fx:controller="client.MainController">
|
||||||
|
<columnConstraints>
|
||||||
|
<ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0"/>
|
||||||
|
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
|
||||||
|
</columnConstraints>
|
||||||
|
<rowConstraints>
|
||||||
|
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
|
||||||
|
</rowConstraints>
|
||||||
|
<VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0"
|
||||||
|
style="-fx-background-color: #333333;">
|
||||||
|
<ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
|
||||||
|
</ImageView>
|
||||||
|
<Button mnemonicParsing="false" onAction="#onAddBtnClick" prefHeight="50" prefWidth="50"
|
||||||
|
style="-fx-background-color: #424242;" text="ADD" textAlignment="CENTER" textFill="WHITE">
|
||||||
|
<cursor>
|
||||||
|
<Cursor fx:constant="HAND"/>
|
||||||
|
</cursor>
|
||||||
|
</Button>
|
||||||
|
<Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;"
|
||||||
|
textAlignment="CENTER" textFill="WHITE">
|
||||||
|
ADD
|
||||||
|
<cursor>
|
||||||
|
<Cursor fx:constant="HAND"/>
|
||||||
|
</cursor>
|
||||||
|
</Button>
|
||||||
|
<Button mnemonicParsing="false" prefHeight="50" prefWidth="50" style="-fx-background-color: #424242;"
|
||||||
|
textAlignment="CENTER" textFill="WHITE">
|
||||||
|
ADD
|
||||||
|
<cursor>
|
||||||
|
<Cursor fx:constant="HAND"/>
|
||||||
|
</cursor>
|
||||||
|
</Button>
|
||||||
|
</VBox>
|
||||||
|
<GridPane fx:id="calendarGrid" gridLinesVisible="true" GridPane.columnIndex="1">
|
||||||
|
<columnConstraints>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
||||||
|
<ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
|
||||||
|
</columnConstraints>
|
||||||
|
<rowConstraints>
|
||||||
|
<RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER"/>
|
||||||
|
<RowConstraints maxHeight="25.0" minHeight="25.0" vgrow="NEVER"/>
|
||||||
|
<RowConstraints vgrow="ALWAYS"/>
|
||||||
|
</rowConstraints>
|
||||||
|
<Label textFill="WHITE">
|
||||||
|
Monat
|
||||||
|
<padding>
|
||||||
|
<Insets left="5"/>
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
|
||||||
|
<Label textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="1">
|
||||||
|
Mo
|
||||||
|
<padding>
|
||||||
|
<Insets left="5"/>
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
<Label textFill="WHITE" GridPane.columnIndex="1" GridPane.rowIndex="1">
|
||||||
|
Di
|
||||||
|
<padding>
|
||||||
|
<Insets left="5"/>
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
<Label textFill="WHITE" GridPane.columnIndex="2" GridPane.rowIndex="1">
|
||||||
|
Mi
|
||||||
|
<padding>
|
||||||
|
<Insets left="5"/>
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
<Label textFill="WHITE" GridPane.columnIndex="3" GridPane.rowIndex="1">
|
||||||
|
Do
|
||||||
|
<padding>
|
||||||
|
<Insets left="5"/>
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
<Label textFill="WHITE" GridPane.columnIndex="4" GridPane.rowIndex="1">
|
||||||
|
Fr
|
||||||
|
<padding>
|
||||||
|
<Insets left="5"/>
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
<Label textFill="WHITE" GridPane.columnIndex="5" GridPane.rowIndex="1">
|
||||||
|
Sa
|
||||||
|
<padding>
|
||||||
|
<Insets left="5"/>
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
<Label textFill="WHITE" GridPane.columnIndex="6" GridPane.rowIndex="1">
|
||||||
|
So
|
||||||
|
<padding>
|
||||||
|
<Insets left="5"/>
|
||||||
|
</padding>
|
||||||
|
</Label>
|
||||||
|
|
||||||
|
<VBox fx:id="vBoxMon" spacing="5.0" GridPane.columnIndex="0" GridPane.rowIndex="2">
|
||||||
|
|
||||||
|
</VBox>
|
||||||
|
<VBox fx:id="vBoxTue" spacing="5.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
|
||||||
|
|
||||||
|
</VBox>
|
||||||
|
<VBox fx:id="vBoxWen" spacing="5.0" GridPane.columnIndex="2" GridPane.rowIndex="2">
|
||||||
|
|
||||||
|
</VBox>
|
||||||
|
<VBox fx:id="vBoxThu" spacing="5.0" GridPane.columnIndex="3" GridPane.rowIndex="2">
|
||||||
|
|
||||||
|
</VBox>
|
||||||
|
<VBox fx:id="vBoxFri" spacing="5.0" GridPane.columnIndex="4" GridPane.rowIndex="2">
|
||||||
|
|
||||||
|
</VBox>
|
||||||
|
<VBox fx:id="vBoxSat" spacing="5.0" GridPane.columnIndex="5" GridPane.rowIndex="2">
|
||||||
|
|
||||||
|
</VBox>
|
||||||
|
<VBox fx:id="vBoxSun" spacing="5.0" GridPane.columnIndex="6" GridPane.rowIndex="2">
|
||||||
|
|
||||||
|
</VBox>
|
||||||
|
</GridPane>
|
||||||
|
</GridPane>
|
||||||
5
hellofx/build.gradle.kts
Normal file
5
hellofx/build.gradle.kts
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
allprojects {
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
}
|
||||||
10
hellofx/data/build.gradle.kts
Normal file
10
hellofx/data/build.gradle.kts
Normal file
@ -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")
|
||||||
|
}
|
||||||
2
hellofx/data/build/tmp/jar/MANIFEST.MF
Normal file
2
hellofx/data/build/tmp/jar/MANIFEST.MF
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
Manifest-Version: 1.0
|
||||||
|
|
||||||
8
hellofx/data/src/main/java/kaka/Dings.java
Normal file
8
hellofx/data/src/main/java/kaka/Dings.java
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
package kaka;
|
||||||
|
|
||||||
|
public class Dings {
|
||||||
|
|
||||||
|
public static int a() {
|
||||||
|
return 5;
|
||||||
|
}
|
||||||
|
}
|
||||||
68
hellofx/data/src/main/java/res/Event.java
Normal file
68
hellofx/data/src/main/java/res/Event.java
Normal file
@ -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;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
63
hellofx/data/src/main/java/res/RestController.java
Normal file
63
hellofx/data/src/main/java/res/RestController.java
Normal file
@ -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<Event> eventList;
|
||||||
|
|
||||||
|
// Parse JSON
|
||||||
|
ObjectMapper objectMapper = new ObjectMapper();
|
||||||
|
//String json = "{ \"color\" : \"Black\", \"type\" : \"BMW\" }";
|
||||||
|
|
||||||
|
return objectMapper.readValue(jsonString, Event[].class);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,5 +1,6 @@
|
|||||||
|
#Tue Nov 15 11:51:46 CET 2016
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
|
||||||
139
client/gradlew → hellofx/gradlew
vendored
139
client/gradlew → hellofx/gradlew
vendored
@ -1,20 +1,4 @@
|
|||||||
#!/usr/bin/env sh
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
#
|
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
##
|
##
|
||||||
@ -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
|
# Attempt to set APP_HOME
|
||||||
# Resolve links: $0 may be a link
|
# Resolve links: $0 may be a link
|
||||||
PRG="$0"
|
PRG="$0"
|
||||||
@ -40,49 +60,8 @@ cd "`dirname \"$PRG\"`/" >/dev/null
|
|||||||
APP_HOME="`pwd -P`"
|
APP_HOME="`pwd -P`"
|
||||||
cd "$SAVED" >/dev/null
|
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
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
@ -106,7 +85,7 @@ location of your Java installation."
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# 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`
|
MAX_FD_LIMIT=`ulimit -H -n`
|
||||||
if [ $? -eq 0 ] ; then
|
if [ $? -eq 0 ] ; then
|
||||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; 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\""
|
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
# For Cygwin, switch paths to Windows format before running java
|
||||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
if $cygwin ; then
|
||||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
||||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
||||||
|
|
||||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
JAVACMD=`cygpath --unix "$JAVACMD"`
|
||||||
|
|
||||||
# We build the pattern for arguments to be converted via cygpath
|
# We build the pattern for arguments to be converted via cygpath
|
||||||
@ -156,30 +134,27 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
|||||||
else
|
else
|
||||||
eval `echo args$i`="\"$arg\""
|
eval `echo args$i`="\"$arg\""
|
||||||
fi
|
fi
|
||||||
i=`expr $i + 1`
|
i=$((i+1))
|
||||||
done
|
done
|
||||||
case $i in
|
case $i in
|
||||||
0) set -- ;;
|
(0) set -- ;;
|
||||||
1) set -- "$args0" ;;
|
(1) set -- "$args0" ;;
|
||||||
2) set -- "$args0" "$args1" ;;
|
(2) set -- "$args0" "$args1" ;;
|
||||||
3) set -- "$args0" "$args1" "$args2" ;;
|
(3) set -- "$args0" "$args1" "$args2" ;;
|
||||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
||||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
||||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
||||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
||||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
||||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Escape application args
|
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
|
||||||
save () {
|
function splitJvmOpts() {
|
||||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
JVM_OPTS=("$@")
|
||||||
echo " "
|
|
||||||
}
|
}
|
||||||
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
|
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
|
||||||
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" "$@"
|
|
||||||
53
client/gradlew.bat → hellofx/gradlew.bat
vendored
53
client/gradlew.bat → hellofx/gradlew.bat
vendored
@ -1,19 +1,3 @@
|
|||||||
@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
|
@if "%DEBUG%" == "" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@rem
|
@rem
|
||||||
@ -24,23 +8,20 @@
|
|||||||
@rem Set local scope for the variables with windows NT shell
|
@rem Set local scope for the variables with windows NT shell
|
||||||
if "%OS%"=="Windows_NT" setlocal
|
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
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%" == "" set DIRNAME=.
|
if "%DIRNAME%" == "" set DIRNAME=.
|
||||||
set APP_BASE_NAME=%~n0
|
set APP_BASE_NAME=%~n0
|
||||||
set APP_HOME=%DIRNAME%
|
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
|
@rem Find java.exe
|
||||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
if defined JAVA_HOME goto findJavaFromJavaHome
|
||||||
|
|
||||||
set JAVA_EXE=java.exe
|
set JAVA_EXE=java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if "%ERRORLEVEL%" == "0" goto execute
|
if "%ERRORLEVEL%" == "0" goto init
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
@ -54,7 +35,7 @@ goto fail
|
|||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto init
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
@ -64,14 +45,34 @@ echo location of your Java installation.
|
|||||||
|
|
||||||
goto fail
|
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
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute Gradle
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
"%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
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
2
hellofx/settings.gradle.kts
Normal file
2
hellofx/settings.gradle.kts
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
include("app")
|
||||||
|
include("data")
|
||||||
Loading…
Reference in New Issue
Block a user