vergnet/clavardator
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

chore: use tab instead of spaces

Browse source
This commit is contained in:
Arnaud Vergnet 2020-11-23 16:40:57 +01:00
parent ff0be945cd
commit 062880407b
18 changed files with 229 additions and 223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.idea/gradle.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>

16
src/main/java/fr/insa/clavardator/FXMLController.java
View file

@ -9,13 +9,13 @@ import java.util.ResourceBundle;
public class FXMLController implements Initializable { public class FXMLController implements Initializable {
@FXML @FXML
private Label label; private Label label;
@Override @Override
public void initialize(URL url, ResourceBundle rb) { public void initialize(URL url, ResourceBundle rb) {
String javaVersion = System.getProperty("java.version"); String javaVersion = System.getProperty("java.version");
String javafxVersion = System.getProperty("javafx.version"); String javafxVersion = System.getProperty("javafx.version");
label.setText("-= CLAVARDATOR =-\nusing JavaFX " + javafxVersion + "\nRunning on Java " + javaVersion + "."); label.setText("-= CLAVARDATOR =-\nusing JavaFX " + javafxVersion + "\nRunning on Java " + javaVersion + ".");
} }
} }

6
src/main/java/fr/insa/clavardator/Launcher.java
View file

@ -1,7 +1,7 @@
package fr.insa.clavardator; package fr.insa.clavardator;
public class Launcher { public class Launcher {
public static void main(String[] args) { public static void main(String[] args) {
MainApp.main(args); MainApp.main(args);
} }
} }

24
src/main/java/fr/insa/clavardator/MainApp.java
View file

@ -9,20 +9,20 @@ import javafx.stage.Stage;
public class MainApp extends Application { public class MainApp extends Application {
public static void main(String[] args) { public static void main(String[] args) {
launch(args); launch(args);
} }
@Override @Override
public void start(Stage stage) throws Exception { public void start(Stage stage) throws Exception {
Parent root = FXMLLoader.load(getClass().getResource("scene.fxml")); Parent root = FXMLLoader.load(getClass().getResource("scene.fxml"));
Scene scene = new Scene(root); Scene scene = new Scene(root);
scene.getStylesheets().add(getClass().getResource("styles.css").toExternalForm()); scene.getStylesheets().add(getClass().getResource("styles.css").toExternalForm());
stage.setTitle("JavaFX and Gradle"); stage.setTitle("Clavardator");
stage.setScene(scene); stage.setScene(scene);
stage.show(); stage.show();
} }
} }

6
src/main/java/fr/insa/clavardator/TestClass.java
View file

@ -1,7 +1,7 @@
package fr.insa.clavardator; package fr.insa.clavardator;
public class TestClass { public class TestClass {
public int test(int v) { public int test(int v) {
return v; return v;
} }
} }

58
src/main/java/fr/insa/clavardator/chat/ChatHistory.java
View file

@ -6,46 +6,46 @@ import javafx.beans.Observable;
public class ChatHistory implements Observable { public class ChatHistory implements Observable {
private DatabaseController db; private DatabaseController db;
public ChatHistory() { public ChatHistory() {
} }
/** /**
* *
*/ */
public void refreshHistory() { public void refreshHistory() {
} }
/** /**
* @param message * @param message
*/ */
public void addMessage(Message message) { public void addMessage(Message message) {
} }
/** /**
* @param message * @param message
*/ */
public void onMessageSaved(Message message) { public void onMessageSaved(Message message) {
} }
/** /**
* *
*/ */
public void onMessagesFetched() { public void onMessagesFetched() {
} }
@Override @Override
public void addListener(InvalidationListener listener) { public void addListener(InvalidationListener listener) {
} }
@Override @Override
public void removeListener(InvalidationListener listener) { public void removeListener(InvalidationListener listener) {
} }
} }

4
src/main/java/fr/insa/clavardator/chat/Message.java
View file

@ -1,6 +1,6 @@
package fr.insa.clavardator.chat; package fr.insa.clavardator.chat;
public class Message { public class Message {
public Message() { public Message() {
} }
} }

50
src/main/java/fr/insa/clavardator/db/DatabaseController.java
View file

@ -3,35 +3,37 @@ package fr.insa.clavardator.db;
import fr.insa.clavardator.chat.Message; import fr.insa.clavardator.chat.Message;
public class DatabaseController extends Thread { public class DatabaseController extends Thread {
public DatabaseController() { public DatabaseController() {
} }
/** /**
* @param callback * @param callback
*/ */
public void getAllUsers(UsersCallback callback) { public void getAllUsers(UsersCallback callback) {
} }
/** /**
* @param message * @param message
* @param callback * @param callback
*/ */
public void addMessage(Message message, MessageCallback callback) { public void addMessage(Message message, MessageCallback callback) {
} }
/** /**
* @param callback * @param callback
*/ */
public void getChatHistory(HistoryCallback callback) { public void getChatHistory(HistoryCallback callback) {
} }
private interface UsersCallback { private interface UsersCallback {
} }
private interface HistoryCallback {
} private interface HistoryCallback {
private interface MessageCallback { }
}
private interface MessageCallback {
}
} }

57
src/main/java/fr/insa/clavardator/network/NetworkConnection.java
View file

@ -8,44 +8,45 @@ import java.net.Socket;
public class NetworkConnection implements Runnable, Observable { public class NetworkConnection implements Runnable, Observable {
private Socket socket; private Socket socket;
public NetworkConnection() { public NetworkConnection() {
} }
/** /**
* @param message * @param message
* @param callback * @param callback
*/ */
public void sendMessage(Message message, MessageCallback callback) { public void sendMessage(Message message, MessageCallback callback) {
} }
/** /**
* @param message * @param message
* @param callback * @param callback
*/ */
public void sendBroadcast(String message, BroadcastCallback callback) { public void sendBroadcast(String message, BroadcastCallback callback) {
} }
@Override @Override
public void run() { public void run() {
} }
@Override @Override
public void addListener(InvalidationListener listener) { public void addListener(InvalidationListener listener) {
} }
@Override @Override
public void removeListener(InvalidationListener listener) { public void removeListener(InvalidationListener listener) {
} }
public interface MessageCallback { public interface MessageCallback {
} }
public interface BroadcastCallback {
} public interface BroadcastCallback {
}
} }

26
src/main/java/fr/insa/clavardator/users/ActiveUser.java
View file

@ -5,23 +5,23 @@ import fr.insa.clavardator.network.NetworkConnection;
public class ActiveUser extends PeerUser { public class ActiveUser extends PeerUser {
private NetworkConnection networkController; private NetworkConnection networkController;
public ActiveUser() { public ActiveUser() {
} }
/** /**
* @param message * @param message
*/ */
public void sendMessage(Message message) { public void sendMessage(Message message) {
} }
/** /**
* @param message * @param message
*/ */
public void onMessageSent(Message message) { public void onMessageSent(Message message) {
} }
} }

14
src/main/java/fr/insa/clavardator/users/CurrentUser.java
View file

@ -1,14 +1,14 @@
package fr.insa.clavardator.users; package fr.insa.clavardator.users;
public class CurrentUser extends User { public class CurrentUser extends User {
public CurrentUser() { public CurrentUser() {
} }
/** /**
* @param username * @param username
*/ */
public void changeUsername(String username) { public void changeUsername(String username) {
} }
} }

22
src/main/java/fr/insa/clavardator/users/PeerUser.java
View file

@ -4,18 +4,18 @@ import fr.insa.clavardator.chat.ChatHistory;
public class PeerUser extends User { public class PeerUser extends User {
protected ChatHistory history; protected ChatHistory history;
public PeerUser() { public PeerUser() {
} }
/** /**
* Get the value of history * Get the value of history
* *
* @return the value of history * @return the value of history
*/ */
public ChatHistory getHistory() { public ChatHistory getHistory() {
return history; return history;
} }
} }

35
src/main/java/fr/insa/clavardator/users/User.java
View file

@ -5,30 +5,29 @@ import javafx.beans.Observable;
public class User implements Observable { public class User implements Observable {
protected String username; protected String username;
public User() { public User() {
} }
/** /**
* Get the value of username * Get the value of username
* *
* @return the value of username * @return the value of username
*/ */
public String getUsername() { public String getUsername() {
return username; return username;
} }
@Override
public void addListener(InvalidationListener listener) {
@Override }
public void addListener(InvalidationListener listener) {
} @Override
public void removeListener(InvalidationListener listener) {
@Override }
public void removeListener(InvalidationListener listener) {
}
} }

78
src/main/java/fr/insa/clavardator/users/UserList.java
View file

@ -7,58 +7,58 @@ import javafx.beans.Observable;
public class UserList implements Observable { public class UserList implements Observable {
public ActiveUser activeUsers; public ActiveUser activeUsers;
private PeerUser inactiveUsers; private PeerUser inactiveUsers;
private NetworkConnection network; private NetworkConnection network;
private DatabaseController db; private DatabaseController db;
public UserList() { public UserList() {
} }
/** /**
* @param username * @param username
* @return boolean * @return boolean
*/ */
public boolean isUsernameAvailable(String username) { public boolean isUsernameAvailable(String username) {
return false; return false;
} }
/** /**
* @param username * @param username
*/ */
public void propagateUsernameChange(String username) { public void propagateUsernameChange(String username) {
} }
/** /**
* *
*/ */
public void onUsernameChangePropagated() { public void onUsernameChangePropagated() {
} }
/** /**
* *
*/ */
public void discoverActiveUsers() { public void discoverActiveUsers() {
} }
/** /**
* @param user * @param user
*/ */
public void onActiverUserDiscovered(ActiveUser user) { public void onActiverUserDiscovered(ActiveUser user) {
} }
@Override @Override
public void addListener(InvalidationListener listener) { public void addListener(InvalidationListener listener) {
} }
@Override @Override
public void removeListener(InvalidationListener listener) { public void removeListener(InvalidationListener listener) {
} }
} }

26
src/main/java/fr/insa/clavardator/util/ErrorHandler.java
View file

@ -4,23 +4,23 @@ import javafx.beans.InvalidationListener;
import javafx.beans.Observable; import javafx.beans.Observable;
public class ErrorHandler implements Observable { public class ErrorHandler implements Observable {
public ErrorHandler() { public ErrorHandler() {
} }
/** /**
* @param exception * @param exception
*/ */
public void notifyError(Exception exception) { public void notifyError(Exception exception) {
} }
@Override @Override
public void addListener(InvalidationListener listener) { public void addListener(InvalidationListener listener) {
} }
@Override @Override
public void removeListener(InvalidationListener listener) { public void removeListener(InvalidationListener listener) {
} }
} }

14
src/main/resources/fr/insa/clavardator/scene.fxml
View file

@ -1,14 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.Label?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.StackPane?>
<StackPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.insa.clavardator.FXMLController"> <StackPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0"
prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="fr.insa.clavardator.FXMLController">
<children> <children>
<Label fx:id="label" text="Label" /> <Label fx:id="label" stylesheets="@styles.css" text="Label" textAlignment="CENTER"/>
<BorderPane prefHeight="200.0" prefWidth="200.0"> <BorderPane prefHeight="200.0" prefWidth="200.0">
<top> <top>
<BorderPane prefHeight="11.0" prefWidth="368.0" BorderPane.alignment="CENTER" /> <BorderPane prefHeight="11.0" prefWidth="368.0" BorderPane.alignment="CENTER"/>
</top> </top>
</BorderPane> </BorderPane>
</children> </children>

3
src/main/resources/fr/insa/clavardator/styles.css
View file

@ -1,3 +1,4 @@
.label { .label {
-fx-text-fill: blue; -fx-text-fill: #5c8d7b;
-fx-text-alignment: center;
} }

12
src/test/java/fr/insa/clavardator/FirstTest.java
View file

@ -1,16 +1,16 @@
package fr.insa.clavardator; package fr.insa.clavardator;
import fr.insa.clavardator.TestClass;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
// See here: https://junit.org/junit5/docs/current/user-guide/#overview // See here: https://junit.org/junit5/docs/current/user-guide/#overview
public class FirstTest { public class FirstTest {
private final TestClass t = new TestClass(); private final TestClass t = new TestClass();
@Test @Test
void addition() { void addition() {
assertEquals(2, t.test(2)); assertEquals(2, t.test(2));
} }
} }