chore: use tab instead of spaces

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -5,30 +5,29 @@ import javafx.beans.Observable;
public class User implements Observable {
protected String username;
protected String username;
public User() {
}
public User() {
}
/**
* Get the value of username
*
* @return the value of username
*/
public String getUsername() {
return username;
}
/**
* Get the value of username
*
* @return the value of username
*/
public String getUsername() {
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) {
}
}
}

View file

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

View file

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

View file

@ -1,14 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<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">
<?import javafx.scene.control.Label?>
<?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">
<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">
<top>
<BorderPane prefHeight="11.0" prefWidth="368.0" BorderPane.alignment="CENTER" />
<BorderPane prefHeight="11.0" prefWidth="368.0" BorderPane.alignment="CENTER"/>
</top>
</BorderPane>
</children>

View file

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

View file

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