From cb1c90ae2180d2c02f286a060eb9593c4cfa401d Mon Sep 17 00:00:00 2001
From: Simeon Christoffersen <simeonc@stud.ntnu.no>
Date: Thu, 9 Sep 2021 09:08:18 +0000
Subject: [PATCH] initial commit
---
simeonc-calc/src/main/java/app/{App.java => CalcApp.java} | 4 ++--
.../main/java/app/{AppController.java => CalcController.java} | 4 ++--
simeonc-calc/src/main/resources/app/{App.fxml => Calc.fxml} | 2 +-
simeonc-calc/src/test/java/app/AppTest.java | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
rename simeonc-calc/src/main/java/app/{App.java => CalcApp.java} (88%)
rename simeonc-calc/src/main/java/app/{AppController.java => CalcController.java} (98%)
rename simeonc-calc/src/main/resources/app/{App.fxml => Calc.fxml} (97%)
diff --git a/simeonc-calc/src/main/java/app/App.java b/simeonc-calc/src/main/java/app/CalcApp.java
similarity index 88%
rename from simeonc-calc/src/main/java/app/App.java
rename to simeonc-calc/src/main/java/app/CalcApp.java
index b27d095..cec1706 100644
--- a/simeonc-calc/src/main/java/app/App.java
+++ b/simeonc-calc/src/main/java/app/CalcApp.java
@@ -11,11 +11,11 @@ import java.io.IOException;
/**
* JavaFX App
*/
-public class App extends Application {
+public class CalcApp extends Application {
@Override
public void start(Stage stage) throws IOException {
- FXMLLoader fxmlLoader = new FXMLLoader(this.getClass().getResource("App.fxml"));
+ FXMLLoader fxmlLoader = new FXMLLoader(this.getClass().getResource("Calc.fxml"));
Parent parent = fxmlLoader.load();
stage.setScene(new Scene(parent));
stage.show();
diff --git a/simeonc-calc/src/main/java/app/AppController.java b/simeonc-calc/src/main/java/app/CalcController.java
similarity index 98%
rename from simeonc-calc/src/main/java/app/AppController.java
rename to simeonc-calc/src/main/java/app/CalcController.java
index 29e3164..1f58957 100644
--- a/simeonc-calc/src/main/java/app/AppController.java
+++ b/simeonc-calc/src/main/java/app/CalcController.java
@@ -10,11 +10,11 @@ import javafx.scene.control.Label;
import javafx.scene.control.Labeled;
import javafx.scene.control.ListView;
-public class AppController {
+public class CalcController {
private Calc calc;
- public AppController() {
+ public CalcController() {
calc = new Calc(0.0, 0.0, 0.0);
}
diff --git a/simeonc-calc/src/main/resources/app/App.fxml b/simeonc-calc/src/main/resources/app/Calc.fxml
similarity index 97%
rename from simeonc-calc/src/main/resources/app/App.fxml
rename to simeonc-calc/src/main/resources/app/Calc.fxml
index e46a056..42b3b82 100644
--- a/simeonc-calc/src/main/resources/app/App.fxml
+++ b/simeonc-calc/src/main/resources/app/Calc.fxml
@@ -5,7 +5,7 @@
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ListView?>
-<GridPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="app.AppController"
+<GridPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="app.CalcController"
alignment="CENTER" hgap="10.0" vgap="10.0" >
<ListView fx:id="operandsView" prefHeight="80.0"
diff --git a/simeonc-calc/src/test/java/app/AppTest.java b/simeonc-calc/src/test/java/app/AppTest.java
index 209ebfc..73f8100 100644
--- a/simeonc-calc/src/test/java/app/AppTest.java
+++ b/simeonc-calc/src/test/java/app/AppTest.java
@@ -24,12 +24,12 @@ import org.testfx.matcher.control.LabeledMatchers;
*/
public class AppTest extends ApplicationTest {
- private AppController controller;
+ private CalcController controller;
private Parent root;
@Override
public void start(Stage stage) throws IOException {
- FXMLLoader fxmlLoader = new FXMLLoader(this.getClass().getResource("App.fxml"));
+ FXMLLoader fxmlLoader = new FXMLLoader(this.getClass().getResource("Calc.fxml"));
root = fxmlLoader.load();
controller = fxmlLoader.getController();
stage.setScene(new Scene(root));
--
GitLab