From a85473d83c61bd5c2e9905b331878275bfb62e52 Mon Sep 17 00:00:00 2001
From: Eilert Tunheim <emtunhei@stud.ntnu.no>
Date: Mon, 14 Feb 2022 14:57:21 +0100
Subject: [PATCH] Fixed project folder structure and created a basic start to
the GUI
---
.idea/codeStyles/codeStyleConfig.xml | 5 +
.idea/libraries/lib.xml | 13 ++
.idea/modules.xml | 2 +-
.idea/uiDesigner.xml | 124 ++++++++++++++++++
application.iml | 17 +++
.../application/com/application/Main.class | Bin 0 -> 1373 bytes
.../application/com/application/test.class | Bin 0 -> 269 bytes
out/production/repo/com/company/Main.class | Bin 540 -> 0 bytes
.../application/com/application/test.class | Bin 0 -> 269 bytes
repo.iml | 12 --
src/com/company/Main.java | 8 --
src/main/java/com/application/Main.java | 42 ++++++
src/test/java/com/application/test.java | 6 +
13 files changed, 208 insertions(+), 21 deletions(-)
create mode 100644 .idea/codeStyles/codeStyleConfig.xml
create mode 100644 .idea/libraries/lib.xml
create mode 100644 .idea/uiDesigner.xml
create mode 100644 application.iml
create mode 100644 out/production/application/com/application/Main.class
create mode 100644 out/production/application/com/application/test.class
delete mode 100644 out/production/repo/com/company/Main.class
create mode 100644 out/test/application/com/application/test.class
delete mode 100644 repo.iml
delete mode 100644 src/com/company/Main.java
create mode 100644 src/main/java/com/application/Main.java
create mode 100644 src/test/java/com/application/test.java
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..a55e7a1
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+ <state>
+ <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+ </state>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
new file mode 100644
index 0000000..b9b7733
--- /dev/null
+++ b/.idea/libraries/lib.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="lib">
+ <CLASSES>
+ <root url="file://C:/Program Files/Java/javafx-sdk-11.0.2/lib" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="file://C:/Program Files/Java/javafx-sdk-11.0.2/lib" />
+ </SOURCES>
+ <jarDirectory url="file://C:/Program Files/Java/javafx-sdk-11.0.2/lib" recursive="false" />
+ <jarDirectory url="file://C:/Program Files/Java/javafx-sdk-11.0.2/lib" recursive="false" type="SOURCES" />
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index c8495c6..4f89f92 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/repo.iml" filepath="$PROJECT_DIR$/repo.iml" />
+ <module fileurl="file://$PROJECT_DIR$/application.iml" filepath="$PROJECT_DIR$/application.iml" />
</modules>
</component>
</project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Palette2">
+ <group name="Swing">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+ </item>
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+ <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+ <initial-values>
+ <property name="text" value="Button" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="RadioButton" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="CheckBox" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="Label" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+ <preferred-size width="-1" height="20" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+ </item>
+ </group>
+ </component>
+</project>
\ No newline at end of file
diff --git a/application.iml b/application.iml
new file mode 100644
index 0000000..07e32b1
--- /dev/null
+++ b/application.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="lib" level="project" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/out/production/application/com/application/Main.class b/out/production/application/com/application/Main.class
new file mode 100644
index 0000000000000000000000000000000000000000..69464d6cacee835015977a22051d0cfae76de51e
GIT binary patch
literal 1373
zcmX^0Z`VEs1_l#`U@iu62170eF$N<J24gM;69!Xu1~V=ORt7^(1~CS64h9Pl$C91F
zii?2@q>_ulnw!Cf!IquDj?JOy00RiHIpjNlXa+6@J_dV`DGngQk)6Sboxz!rfi0=D
zq$EF&kwMlcE3qswtwO&zIW;d;KRG|Iq$oc}-w7;j&B(xJlbM%UV#mn9tf3jk$iU*9
zpOVVR!0(fpm+DuVo0M7<l9-f}%E%z(lb@WJ6P8$%3F1QqSxPc8iy0Zje3J8X^%DyU
zax#+>OEUBG^nDXE^Q;*eSaK6H^B5V#G@`+-(9cQCOV<xBDay=Cw+7pmSd?DO$RLbG
znvsFExFoTtgpom91FRY3g_6YdRQ+HO3D(Y2P?VXQSX2oXVPp`&rjC(;Ehn)uzqEvr
zK^`s-4ho1c$hhR}fW*91Ymk*78Dx_{eEnb$Y0b#M<yw)PS^)B3F*}0`BLi1(erZv1
zs#_)~fH*;Z)&m7L4}%ngG!KI-gAyZyly81&PFZT6f=f|lW?s62BO;L48Qgdn+!;I=
z8KgnFK>h>SgBC?R3=#~Ij0_ykIho1X3c0B~44xn@vM5^6y~4xb#o*1(;KRe<%izbz
zAcUeA>>H39{dpJy7y@}1f*7P38APx}AtQqvR4a1iBKd)lK^UX}60z{m0f%{MUUCMK
z)u2cNg>`x=BLhcqYDq|D2`JP=A(0C)04Zg#gOsFJlrS=Ir>B-UXJqE26s6`dGN@{3
z!eTKwKPM+O85|q>{z=8DMP;Cr>62MpV$H~)2y#|hg+6XYj10_)DJhH$C@%0%%1TWx
zvDS=YWRQZm3?3~3iAAY-CDtx3po9zZ0XQ5{k|#L&z{23<$x@t=U(TS&AjTlhz`(%B
zzyOL$1_lOZ21ZZ{VPIsCVPIg;XJ7=&v1)B+VBE;Sz`(>H%fP_E1{UOGkYiwA-~qE)
z8RQuh7#J8h859|mpqh>0ns+cTAvAL_FflMN@G`J4@Szx>%%B2xi7JB{0~6TxjSTDz
zEDQ_`p4vjp+Zb51b~CU>Zf9WI%D}F*g@Ij&V;ckKZU(N%?F`($I@=g{K!Q6Nc$pZ&
zcQf!s>WDD#i!caoXAt(&*4@S+qP>kl6yXRp22KVB25AO11~~>n26+Z41|<e124w~V
z22}=o1~mp326YAx22HR7wIGgw`jCOalR=$9gMpDji9ww~lR=AtiNT(Mi$R+~hk=<v
Umw|zSg@KVlkAaav9~@o=0HohR6951J
literal 0
HcmV?d00001
diff --git a/out/production/application/com/application/test.class b/out/production/application/com/application/test.class
new file mode 100644
index 0000000000000000000000000000000000000000..8052a9b849a81e5b25de3f82573210073dd7b707
GIT binary patch
literal 269
zcmX^0Z`VEs1_l!b0WJn+23~dsK6VCvMg}&U%)HDJJ4Oa(4b3n{1{UZ1lvG9rexJ;|
zRKL>Pq|~C2#H5^5Mg}3D{N%)(u*9NF5FaYYQj(Eb%*Y_-lboNcpIA_klbM`Yl9`{U
zUy@o}V$I0F6`WsMl$`382{M5bB&e5_SeD4cz{0@F$RL7E7bAlJNQr(<VqUtwe^ORz
zatVVX0}}%?0|+oOFoN_lFfy<)FfiydfcOjytXkU{7&kI7FfcK&GcYi)F)%VPFfcQ4
YFfcIifZ41JoD5tH3=E76++bBa0E*!^fdBvi
literal 0
HcmV?d00001
diff --git a/out/production/repo/com/company/Main.class b/out/production/repo/com/company/Main.class
deleted file mode 100644
index fe21581591329ec1fb763458143c792995feda47..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 540
zcmX^0Z`VEs1_l!bB`yXw1`$pMQ3f#%25~M12?j}a1}Sz1X+{P%o6Nk-5<5l)W)00S
zMg|t={FGEi27aH+yi~u^+@#c^ki?{%R7M6NpZw&+oUp{AOb{O`$WoG#Sqzd(&d=3P
z&d)7K%&XM*P0Y-*W@KQ=P0Y+=WDwJc_Q^^tOVrOv%uCk~E-A{)OScBwlvtEr%*Y^&
zMVgU;D>%QjC^^+F6J#|f$V5GmAv_H13>@qXGCT~j404PNJRYezIr$3Z`9(P?itG&X
zJPZm9ii`{b=&oU85CG|hIKe+DD>b<UMJTwkxFj`~k%2kCw1kmC6yn~@eEoo;%)FA|
zlA_eaTx&)KVXzsf!i)^;1t3K^d5jFA8W4@B9%WEuU}a!q00AZjMv(g%7#TPj7#Q>!
z7#SED7#LW!wlgqpWME)mV&Gz6U|<6aGBa>9Ffj0d*{lpa47>~s44e#n4E#{d<_sXi
q7#KJ=F)#@+Z)0FV7{JBA1U80)fgQ;ZP6h!6K?Vi}Mg}3URl)#?H*iz{
diff --git a/out/test/application/com/application/test.class b/out/test/application/com/application/test.class
new file mode 100644
index 0000000000000000000000000000000000000000..8052a9b849a81e5b25de3f82573210073dd7b707
GIT binary patch
literal 269
zcmX^0Z`VEs1_l!b0WJn+23~dsK6VCvMg}&U%)HDJJ4Oa(4b3n{1{UZ1lvG9rexJ;|
zRKL>Pq|~C2#H5^5Mg}3D{N%)(u*9NF5FaYYQj(Eb%*Y_-lboNcpIA_klbM`Yl9`{U
zUy@o}V$I0F6`WsMl$`382{M5bB&e5_SeD4cz{0@F$RL7E7bAlJNQr(<VqUtwe^ORz
zatVVX0}}%?0|+oOFoN_lFfy<)FfiydfcOjytXkU{7&kI7FfcK&GcYi)F)%VPFfcQ4
YFfcIifZ41JoD5tH3=E76++bBa0E*!^fdBvi
literal 0
HcmV?d00001
diff --git a/repo.iml b/repo.iml
deleted file mode 100644
index d5c0743..0000000
--- a/repo.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
-
diff --git a/src/com/company/Main.java b/src/com/company/Main.java
deleted file mode 100644
index 4582a95..0000000
--- a/src/com/company/Main.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.company;
-
-public class Main {
-
- public static void main(String[] args) {
- System.out.println("Hello world!");
- }
-}
diff --git a/src/main/java/com/application/Main.java b/src/main/java/com/application/Main.java
new file mode 100644
index 0000000..d6e173c
--- /dev/null
+++ b/src/main/java/com/application/Main.java
@@ -0,0 +1,42 @@
+package com.application;
+
+import javafx.application.Application;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.layout.StackPane;
+import javafx.stage.Stage;
+
+public class Main extends Application {
+ Button button;
+ public static void main(String[] args) {
+ //System.out.println("Hello world!");
+ launch(args);
+ }
+
+ /**
+ * Main javafx code
+ * Stage = The whole window
+ * Scene = Content inside the stage. Put buttons and dropdown stuff
+ * @param primaryStage
+ * @throws Exception
+ */
+ @Override
+ public void start(Stage primaryStage) throws Exception {
+
+ // Sett title in top left of the stage
+ primaryStage.setTitle("Moelven Drying Application");
+
+ // Creates a button
+ button = new Button();
+ button.setText("Click me");
+
+ // Creates a stackpane, attaches the button to the
+ StackPane layout = new StackPane();
+ layout.getChildren().add(button);
+
+ Scene scene = new Scene(layout, 300, 250);
+ primaryStage.setScene(scene);
+ primaryStage.show();
+
+ }
+}
diff --git a/src/test/java/com/application/test.java b/src/test/java/com/application/test.java
new file mode 100644
index 0000000..b4eea50
--- /dev/null
+++ b/src/test/java/com/application/test.java
@@ -0,0 +1,6 @@
+package com.application;
+
+public class test
+{
+
+}
--
GitLab