From a2543bd38e51862938e216c51b0090f6a35f6b1f Mon Sep 17 00:00:00 2001
From: Simeon Christoffersen <simeonc@stud.ntnu.no>
Date: Thu, 9 Sep 2021 10:08:58 +0000
Subject: [PATCH] Changes done
---
javafx-template/.project | 34 +++++++++++++++++++
javafx-template/bin/.project | 34 +++++++++++++++++++
modules-template/.project | 28 +++++++++++++++
packages-template/.project | 28 +++++++++++++++
simeonc-calc/pom.xml | 4 +--
simeonc-calc/src/main/java/module-info.java | 4 +--
.../main/java/{app => simeonc/calc}/Calc.java | 2 +-
.../java/{app => simeonc/calc}/CalcApp.java | 2 +-
.../{app => simeonc/calc}/CalcController.java | 2 +-
.../resources/{app => simeonc/calc}/Calc.fxml | 2 +-
.../java/{app => simeonc/calc}/AppTest.java | 2 +-
.../java/{app => simeonc/calc}/CalcTest.java | 2 +-
.../test/java/{app => simeonc/calc}/README.md | 0
13 files changed, 134 insertions(+), 10 deletions(-)
create mode 100644 javafx-template/.project
create mode 100644 javafx-template/bin/.project
create mode 100644 modules-template/.project
create mode 100644 packages-template/.project
rename simeonc-calc/src/main/java/{app => simeonc/calc}/Calc.java (99%)
rename simeonc-calc/src/main/java/{app => simeonc/calc}/CalcApp.java (96%)
rename simeonc-calc/src/main/java/{app => simeonc/calc}/CalcController.java (99%)
rename simeonc-calc/src/main/resources/{app => simeonc/calc}/Calc.fxml (97%)
rename simeonc-calc/src/test/java/{app => simeonc/calc}/AppTest.java (99%)
rename simeonc-calc/src/test/java/{app => simeonc/calc}/CalcTest.java (99%)
rename simeonc-calc/src/test/java/{app => simeonc/calc}/README.md (100%)
diff --git a/javafx-template/.project b/javafx-template/.project
new file mode 100644
index 0000000..bfbdadf
--- /dev/null
+++ b/javafx-template/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>javafx-template</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+ <filteredResources>
+ <filter>
+ <id>1631170920238</id>
+ <name></name>
+ <type>30</type>
+ <matcher>
+ <id>org.eclipse.core.resources.regexFilterMatcher</id>
+ <arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
+</projectDescription>
diff --git a/javafx-template/bin/.project b/javafx-template/bin/.project
new file mode 100644
index 0000000..bfbdadf
--- /dev/null
+++ b/javafx-template/bin/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>javafx-template</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+ <filteredResources>
+ <filter>
+ <id>1631170920238</id>
+ <name></name>
+ <type>30</type>
+ <matcher>
+ <id>org.eclipse.core.resources.regexFilterMatcher</id>
+ <arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
+</projectDescription>
diff --git a/modules-template/.project b/modules-template/.project
new file mode 100644
index 0000000..8f9907a
--- /dev/null
+++ b/modules-template/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>modules-template</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+ <filteredResources>
+ <filter>
+ <id>1631170920292</id>
+ <name></name>
+ <type>30</type>
+ <matcher>
+ <id>org.eclipse.core.resources.regexFilterMatcher</id>
+ <arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
+</projectDescription>
diff --git a/packages-template/.project b/packages-template/.project
new file mode 100644
index 0000000..664d10d
--- /dev/null
+++ b/packages-template/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>packages-template</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+ <filteredResources>
+ <filter>
+ <id>1631170920315</id>
+ <name></name>
+ <type>30</type>
+ <matcher>
+ <id>org.eclipse.core.resources.regexFilterMatcher</id>
+ <arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
+</projectDescription>
diff --git a/simeonc-calc/pom.xml b/simeonc-calc/pom.xml
index 3488ad5..6d3fe15 100644
--- a/simeonc-calc/pom.xml
+++ b/simeonc-calc/pom.xml
@@ -83,7 +83,7 @@
<version>3.0.0-M5</version>
<configuration>
<argLine>
- --add-opens app/app=ALL-UNNAMED --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
+ --add-opens simeonc.calc/simeonc.calc=ALL-UNNAMED --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
@@ -95,7 +95,7 @@
<!-- Default configuration for running -->
<!-- Usage: mvn javafx:run -->
<configuration>
- <mainClass>app.App</mainClass>
+ <mainClass>simeonc.calc.CalcApp</mainClass>
</configuration>
</plugin>
</plugins>
diff --git a/simeonc-calc/src/main/java/module-info.java b/simeonc-calc/src/main/java/module-info.java
index 7630870..e2c3169 100644
--- a/simeonc-calc/src/main/java/module-info.java
+++ b/simeonc-calc/src/main/java/module-info.java
@@ -1,6 +1,6 @@
-module app {
+module simeonc.calc {
requires javafx.controls;
requires javafx.fxml;
- opens app to javafx.graphics, javafx.fxml;
+ opens simeonc.calc to javafx.graphics, javafx.fxml;
}
diff --git a/simeonc-calc/src/main/java/app/Calc.java b/simeonc-calc/src/main/java/simeonc/calc/Calc.java
similarity index 99%
rename from simeonc-calc/src/main/java/app/Calc.java
rename to simeonc-calc/src/main/java/simeonc/calc/Calc.java
index eb59b2f..eedbdff 100644
--- a/simeonc-calc/src/main/java/app/Calc.java
+++ b/simeonc-calc/src/main/java/simeonc/calc/Calc.java
@@ -1,4 +1,4 @@
-package app;
+package simeonc.calc;
import java.util.ArrayList;
import java.util.List;
diff --git a/simeonc-calc/src/main/java/app/CalcApp.java b/simeonc-calc/src/main/java/simeonc/calc/CalcApp.java
similarity index 96%
rename from simeonc-calc/src/main/java/app/CalcApp.java
rename to simeonc-calc/src/main/java/simeonc/calc/CalcApp.java
index cec1706..d7b8755 100644
--- a/simeonc-calc/src/main/java/app/CalcApp.java
+++ b/simeonc-calc/src/main/java/simeonc/calc/CalcApp.java
@@ -1,4 +1,4 @@
-package app;
+package simeonc.calc;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
diff --git a/simeonc-calc/src/main/java/app/CalcController.java b/simeonc-calc/src/main/java/simeonc/calc/CalcController.java
similarity index 99%
rename from simeonc-calc/src/main/java/app/CalcController.java
rename to simeonc-calc/src/main/java/simeonc/calc/CalcController.java
index 1f58957..3488dbb 100644
--- a/simeonc-calc/src/main/java/app/CalcController.java
+++ b/simeonc-calc/src/main/java/simeonc/calc/CalcController.java
@@ -1,4 +1,4 @@
-package app;
+package simeonc.calc;
import java.util.List;
import java.util.function.BinaryOperator;
diff --git a/simeonc-calc/src/main/resources/app/Calc.fxml b/simeonc-calc/src/main/resources/simeonc/calc/Calc.fxml
similarity index 97%
rename from simeonc-calc/src/main/resources/app/Calc.fxml
rename to simeonc-calc/src/main/resources/simeonc/calc/Calc.fxml
index 42b3b82..4a05299 100644
--- a/simeonc-calc/src/main/resources/app/Calc.fxml
+++ b/simeonc-calc/src/main/resources/simeonc/calc/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.CalcController"
+<GridPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="simeonc.calc.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/simeonc/calc/AppTest.java
similarity index 99%
rename from simeonc-calc/src/test/java/app/AppTest.java
rename to simeonc-calc/src/test/java/simeonc/calc/AppTest.java
index 73f8100..fe55454 100644
--- a/simeonc-calc/src/test/java/app/AppTest.java
+++ b/simeonc-calc/src/test/java/simeonc/calc/AppTest.java
@@ -1,4 +1,4 @@
-package app;
+package simeonc.calc;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
diff --git a/simeonc-calc/src/test/java/app/CalcTest.java b/simeonc-calc/src/test/java/simeonc/calc/CalcTest.java
similarity index 99%
rename from simeonc-calc/src/test/java/app/CalcTest.java
rename to simeonc-calc/src/test/java/simeonc/calc/CalcTest.java
index 150778d..33501be 100644
--- a/simeonc-calc/src/test/java/app/CalcTest.java
+++ b/simeonc-calc/src/test/java/simeonc/calc/CalcTest.java
@@ -1,4 +1,4 @@
-package app;
+package simeonc.calc;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/simeonc-calc/src/test/java/app/README.md b/simeonc-calc/src/test/java/simeonc/calc/README.md
similarity index 100%
rename from simeonc-calc/src/test/java/app/README.md
rename to simeonc-calc/src/test/java/simeonc/calc/README.md
--
GitLab