From 326b915dbd01795dcf8263a3181ab52a8da792e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Pirkl?= <pirkl.theo@gmail.com>
Date: Fri, 11 Jan 2019 09:50:26 +0100
Subject: [PATCH] Pushes small changes
---
pom.xml | 4 ++--
.../java/ch/hepia/{etu/socialnetwork => }/Main.java | 2 +-
.../socialnetwork => }/ui/ConnectionController.java | 3 ++-
src/main/resources/fxml/ConnectionWindow.fxml | 11 ++++++-----
4 files changed, 11 insertions(+), 9 deletions(-)
rename src/main/java/ch/hepia/{etu/socialnetwork => }/Main.java (94%)
rename src/main/java/ch/hepia/{etu/socialnetwork => }/ui/ConnectionController.java (50%)
diff --git a/pom.xml b/pom.xml
index f60ab18..b8cadd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,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>ch.hepia.etu</groupId>
+ <groupId>ch.hepia</groupId>
<artifactId>tp4</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>HepiaNet</name>
@@ -52,7 +52,7 @@
</execution>
</executions>
<configuration>
- <mainClass>ch.hepia.etu.socialnetwork.Main</mainClass>
+ <mainClass>ch.hepia.Main</mainClass>
</configuration>
</plugin>
</plugins>
diff --git a/src/main/java/ch/hepia/etu/socialnetwork/Main.java b/src/main/java/ch/hepia/Main.java
similarity index 94%
rename from src/main/java/ch/hepia/etu/socialnetwork/Main.java
rename to src/main/java/ch/hepia/Main.java
index d1924c0..e7dbfaa 100644
--- a/src/main/java/ch/hepia/etu/socialnetwork/Main.java
+++ b/src/main/java/ch/hepia/Main.java
@@ -1,4 +1,4 @@
-package ch.hepia.etu.socialnetwork;
+package ch.hepia;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
diff --git a/src/main/java/ch/hepia/etu/socialnetwork/ui/ConnectionController.java b/src/main/java/ch/hepia/ui/ConnectionController.java
similarity index 50%
rename from src/main/java/ch/hepia/etu/socialnetwork/ui/ConnectionController.java
rename to src/main/java/ch/hepia/ui/ConnectionController.java
index 6aaa1b9..f7e1c7a 100644
--- a/src/main/java/ch/hepia/etu/socialnetwork/ui/ConnectionController.java
+++ b/src/main/java/ch/hepia/ui/ConnectionController.java
@@ -1,4 +1,5 @@
-package ch.hepia.etu.socialnetwork.ui;
+package ch.hepia.ui;
public class ConnectionController {
+
}
diff --git a/src/main/resources/fxml/ConnectionWindow.fxml b/src/main/resources/fxml/ConnectionWindow.fxml
index 6201bd3..c08acfa 100644
--- a/src/main/resources/fxml/ConnectionWindow.fxml
+++ b/src/main/resources/fxml/ConnectionWindow.fxml
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.geometry.*?>
-<?import javafx.scene.shape.*?>
-<?import javafx.scene.text.*?>
-<?import javafx.scene.control.*?>
<?import java.lang.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.text.*?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ProgressIndicator?>
<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.Font?>
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="565.0" prefWidth="1000.0" style="-fx-background-color: #bababa;" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="565.0" prefWidth="1000.0" style="-fx-background-color: #bababa;" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.hepia.ui.ConnectionController">
<top>
<Label alignment="CENTER" contentDisplay="CENTER" prefHeight="80.0" prefWidth="1000.0" style="-fx-background-color: #35B1EE;" text="AppNameLabel" textAlignment="CENTER" textFill="WHITE" BorderPane.alignment="CENTER">
<font>
--
GitLab