diff --git a/README.md b/README.md index ade40e2..f00476e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This project contains the source for the 4IR Java project. -Full report available [here](report/report.pdf). +### Full report with installation instructions available in [report/report.pdf](report/report.pdf). ## Group @@ -15,54 +15,9 @@ Full report available [here](report/report.pdf). * JavaFX 11.0.2 (openfx) * Gradle 6.3 -## Installation - -#### Install Java 11 - -Run this command -```shell script -sudo apt install openjdk-11-jdk -``` - -#### Optional: Install JavaFX Scene Builder 11 - -Follow [this link](https://gluonhq.com/products/scene-builder/) to download and install it, then [this link](https://www.jetbrains.com/help/idea/opening-fxml-files-in-javafx-scene-builder.html) to set up Intellij - -#### Build and Run - -Run this command - -```shell script -./gradlew runShadow -``` - -Or in Intellij, open the gradle window and click on `clavardator -> Tasks -> application -> runShadow`. - -#### Generate cross-platform jar - -Run this command - -```shell script -./gradlew build -``` - -This will generate a jar file under `client/build/libs/client-{VERSION}-all.jar`. - -You can then copy this file and place it on any Linux/Windows/Mac environment with at least Java 11 installed. - -#### Running a JAR file - -You can run a jar file with this command: - -```shell script -java -jar .jar -``` - ## Resources * [OpenJDK](https://adoptopenjdk.net/releases.html) * [JavaFX](https://gluonhq.com/products/javafx/) -* [JavaFX Scene Builder](https://gluonhq.com/products/scene-builder/) * [Setting up JavaFX](https://openjfx.io/openjfx-docs/) -* [Settings up Scene builder in Intellij](https://www.jetbrains.com/help/idea/opening-fxml-files-in-javafx-scene-builder.html#open-in-scene-builder) * [Intellij IDEA](https://www.jetbrains.com/idea/) diff --git a/report/conception/changeUsername.png b/report/conception/changeUsername.png deleted file mode 100644 index 2d153a8..0000000 Binary files a/report/conception/changeUsername.png and /dev/null differ diff --git a/report/conception/class diagram.png b/report/conception/class diagram.png deleted file mode 100644 index 4da9b37..0000000 Binary files a/report/conception/class diagram.png and /dev/null differ diff --git a/report/conception/modelisation_projet.xmi b/report/conception/modelisation_projet.xmi deleted file mode 100644 index a91a85f..0000000 --- a/report/conception/modelisation_projet.xmi +++ /dev/null @@ -1,963 +0,0 @@ - - - - - umbrello uml modeller http://umbrello.kde.org - 1.6.18 - UnicodeUTF8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/report/conception/sendMessage.png b/report/conception/sendMessage.png deleted file mode 100644 index 86e50f7..0000000 Binary files a/report/conception/sendMessage.png and /dev/null differ diff --git a/report/conception/use case.png b/report/conception/use case.png deleted file mode 100644 index 8986704..0000000 Binary files a/report/conception/use case.png and /dev/null differ diff --git a/report/conception/viewActiveUsers.png b/report/conception/viewActiveUsers.png deleted file mode 100644 index d18701f..0000000 Binary files a/report/conception/viewActiveUsers.png and /dev/null differ diff --git a/report/conception/viewMessageHistory.png b/report/conception/viewMessageHistory.png deleted file mode 100644 index 159da68..0000000 Binary files a/report/conception/viewMessageHistory.png and /dev/null differ diff --git a/report/report.pdf b/report/report.pdf index f364d62..8c9a822 100644 Binary files a/report/report.pdf and b/report/report.pdf differ