From 022fcec3689f70a9f7eab0cfd2e2bc5ad3393b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolay=20Schi=C3=B8ll-Johansen?=
 <nicolayofficial@gmail.com>
Date: Mon, 9 Mar 2020 08:59:46 +0100
Subject: [PATCH] fixed compile file

---
 .idea/ImageApplication.iml                    |   2 ++
 .idea/compiler.xml                            |   1 -
 .idea/misc.xml                                |   5 ++++-
 .idea/vcs.xml                                 |   2 +-
 src/main/java/NTNU/IDATT1002/App.java         |   2 +-
 ...team-14-software-engineering.kotlin_module | Bin 16 -> 0 bytes
 target/classes/NTNU/IDATT1002/App.class       | Bin 1897 -> 1897 bytes
 target/classes/NTNU/IDATT1002/logged-in.fxml  |   2 +-
 .../compile/default-cli/createdFiles.lst      |   0
 .../compile/default-cli/inputFiles.lst        |   3 ---
 .../compile/null/createdFiles.lst             |   4 ++++
 .../compile/null/inputFiles.lst               |   7 ++++---
 12 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 .idea/ImageApplication.iml
 delete mode 100644 target/classes/META-INF/team-14-software-engineering.kotlin_module
 delete mode 100644 target/maven-status/maven-compiler-plugin/compile/default-cli/createdFiles.lst
 delete mode 100644 target/maven-status/maven-compiler-plugin/compile/default-cli/inputFiles.lst

diff --git a/.idea/ImageApplication.iml b/.idea/ImageApplication.iml
new file mode 100644
index 00000000..78b2cc53
--- /dev/null
+++ b/.idea/ImageApplication.iml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 8a392557..8f00a5c3 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,7 +7,6 @@
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="ImageApplication" />
-        <module name="team-14-software-engineering" />
       </profile>
     </annotationProcessing>
   </component>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d24ea8e7..8a27f0be 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
@@ -8,7 +11,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7f..35eb1ddf 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/NTNU/IDATT1002/App.java b/src/main/java/NTNU/IDATT1002/App.java
index 440db2ff..1edc0bd5 100644
--- a/src/main/java/NTNU/IDATT1002/App.java
+++ b/src/main/java/NTNU/IDATT1002/App.java
@@ -15,7 +15,7 @@ public class App extends Application {
 
     @Override
     public void start(Stage stage) throws IOException {
-        scene = new Scene(loadFXML("Login"));
+        scene = new Scene(loadFXML("login"));
         stage.setScene(scene);
         stage.show();
     }
diff --git a/target/classes/META-INF/team-14-software-engineering.kotlin_module b/target/classes/META-INF/team-14-software-engineering.kotlin_module
deleted file mode 100644
index a49347afef10a9b5f95305e1058ba36adec7d6dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16
RcmZQzU|?ooU|@t|0RRA102TlM

diff --git a/target/classes/NTNU/IDATT1002/App.class b/target/classes/NTNU/IDATT1002/App.class
index 5c22c737004984638d7f5237f07c2117e5fe340a..3ccc92e611c82414752d2a5c564c5f29e32a5d99 100644
GIT binary patch
delta 14
VcmaFK_mXdeDHCJPW-}&ZRsbn11ZDsL

delta 14
VcmaFK_mXdeDHEg5W-}&ZRsbk$1V#V=

diff --git a/target/classes/NTNU/IDATT1002/logged-in.fxml b/target/classes/NTNU/IDATT1002/logged-in.fxml
index 8f022dc6..0e4f9652 100644
--- a/target/classes/NTNU/IDATT1002/logged-in.fxml
+++ b/target/classes/NTNU/IDATT1002/logged-in.fxml
@@ -4,7 +4,7 @@
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
 
-<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.LoggedIn">
+<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.LoggedIn">
    <children>
       <ImageView fitHeight="150.0" fitWidth="200.0" layoutX="200.0" layoutY="125.0" pickOnBounds="true" preserveRatio="true">
          <image>
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-cli/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-cli/createdFiles.lst
deleted file mode 100644
index e69de29b..00000000
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-cli/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-cli/inputFiles.lst
deleted file mode 100644
index 7cbf2f2b..00000000
--- a/target/maven-status/maven-compiler-plugin/compile/default-cli/inputFiles.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-C:\Users\Eirik\OneDrive - NTNU\Skole\IDATT1002\ImageApplication\src\main\java\NTNU\IDATT1002\App.java
-C:\Users\Eirik\OneDrive - NTNU\Skole\IDATT1002\ImageApplication\src\main\java\NTNU\IDATT1002\PrimaryController.java
-C:\Users\Eirik\OneDrive - NTNU\Skole\IDATT1002\ImageApplication\src\main\java\NTNU\IDATT1002\SecondaryController.java
diff --git a/target/maven-status/maven-compiler-plugin/compile/null/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/null/createdFiles.lst
index e69de29b..0e7f130e 100644
--- a/target/maven-status/maven-compiler-plugin/compile/null/createdFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/null/createdFiles.lst
@@ -0,0 +1,4 @@
+NTNU/IDATT1002/SecondaryController.class
+NTNU/IDATT1002/LoggedIn.class
+NTNU/IDATT1002/PrimaryController.class
+NTNU/IDATT1002/App.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/null/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/null/inputFiles.lst
index 7cbf2f2b..ad9b0c8e 100644
--- a/target/maven-status/maven-compiler-plugin/compile/null/inputFiles.lst
+++ b/target/maven-status/maven-compiler-plugin/compile/null/inputFiles.lst
@@ -1,3 +1,4 @@
-C:\Users\Eirik\OneDrive - NTNU\Skole\IDATT1002\ImageApplication\src\main\java\NTNU\IDATT1002\App.java
-C:\Users\Eirik\OneDrive - NTNU\Skole\IDATT1002\ImageApplication\src\main\java\NTNU\IDATT1002\PrimaryController.java
-C:\Users\Eirik\OneDrive - NTNU\Skole\IDATT1002\ImageApplication\src\main\java\NTNU\IDATT1002\SecondaryController.java
+/Users/Shared/Previously Relocated Items/Security/Programmering/Team 14/ImageApplication/src/main/java/NTNU/IDATT1002/App.java
+/Users/Shared/Previously Relocated Items/Security/Programmering/Team 14/ImageApplication/src/main/java/NTNU/IDATT1002/SecondaryController.java
+/Users/Shared/Previously Relocated Items/Security/Programmering/Team 14/ImageApplication/src/main/java/NTNU/IDATT1002/PrimaryController.java
+/Users/Shared/Previously Relocated Items/Security/Programmering/Team 14/ImageApplication/src/main/java/NTNU/IDATT1002/LoggedIn.java
-- 
GitLab