Skip to content
Snippets Groups Projects
Commit a0d1396f authored by Karin Pettersen's avatar Karin Pettersen
Browse files

Merge branch 'master' of git.gvk.idi.ntnu.no:mesji/bacheloroppgave_2022 into Karins_branch 

 Conflicts:
	.idea/vcs.xml
parents c686a388 2a1c1637
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 301 additions and 15 deletions
.idea/libraries/Maven__io_grpc_grpc_xds_1_44_0.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: io.grpc:grpc-xds:1.44.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/grpc/grpc-xds/1.44.0/grpc-xds-1.44.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/grpc/grpc-xds/1.44.0/grpc-xds-1.44.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/grpc/grpc-xds/1.44.0/grpc-xds-1.44.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__io_opencensus_opencensus_api_0_31_0.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: io.opencensus:opencensus-api:0.31.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/opencensus/opencensus-api/0.31.0/opencensus-api-0.31.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/opencensus/opencensus-api/0.31.0/opencensus-api-0.31.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/opencensus/opencensus-api/0.31.0/opencensus-api-0.31.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__io_opencensus_opencensus_contrib_http_util_0_31_0.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: io.opencensus:opencensus-contrib-http-util:0.31.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/opencensus/opencensus-contrib-http-util/0.31.0/opencensus-contrib-http-util-0.31.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/opencensus/opencensus-contrib-http-util/0.31.0/opencensus-contrib-http-util-0.31.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/opencensus/opencensus-contrib-http-util/0.31.0/opencensus-contrib-http-util-0.31.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__io_opencensus_opencensus_proto_0_2_0.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: io.opencensus:opencensus-proto:0.2.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/opencensus/opencensus-proto/0.2.0/opencensus-proto-0.2.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/opencensus/opencensus-proto/0.2.0/opencensus-proto-0.2.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/opencensus/opencensus-proto/0.2.0/opencensus-proto-0.2.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__io_perfmark_perfmark_api_0_23_0.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: io.perfmark:perfmark-api:0.23.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/perfmark/perfmark-api/0.23.0/perfmark-api-0.23.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/perfmark/perfmark-api/0.23.0/perfmark-api-0.23.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/perfmark/perfmark-api/0.23.0/perfmark-api-0.23.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_3_2.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: javax.annotation:javax.annotation-api:1.3.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_13.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: org.apache.httpcomponents:httpclient:4.5.13">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_15.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: org.apache.httpcomponents:httpcore:4.4.15">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.15/httpcore-4.4.15.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.15/httpcore-4.4.15-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.4.15/httpcore-4.4.15-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_bouncycastle_bcpkix_jdk15on_1_67.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: org.bouncycastle:bcpkix-jdk15on:1.67">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcpkix-jdk15on/1.67/bcpkix-jdk15on-1.67.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcpkix-jdk15on/1.67/bcpkix-jdk15on-1.67-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcpkix-jdk15on/1.67/bcpkix-jdk15on-1.67-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_bouncycastle_bcprov_jdk15on_1_67.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: org.bouncycastle:bcprov-jdk15on:1.67">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcprov-jdk15on/1.67/bcprov-jdk15on-1.67.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcprov-jdk15on/1.67/bcprov-jdk15on-1.67-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/bouncycastle/bcprov-jdk15on/1.67/bcprov-jdk15on-1.67-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_checkerframework_checker_qual_3_21_1.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: org.checkerframework:checker-qual:3.21.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.21.1/checker-qual-3.21.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.21.1/checker-qual-3.21.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.21.1/checker-qual-3.21.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_codehaus_mojo_animal_sniffer_annotations_1_20.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.20">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/mojo/animal-sniffer-annotations/1.20/animal-sniffer-annotations-1.20.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/mojo/animal-sniffer-annotations/1.20/animal-sniffer-annotations-1.20-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/mojo/animal-sniffer-annotations/1.20/animal-sniffer-annotations-1.20-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_conscrypt_conscrypt_openjdk_uber_2_5_1.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: org.conscrypt:conscrypt-openjdk-uber:2.5.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/conscrypt/conscrypt-openjdk-uber/2.5.1/conscrypt-openjdk-uber-2.5.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/conscrypt/conscrypt-openjdk-uber/2.5.1/conscrypt-openjdk-uber-2.5.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/conscrypt/conscrypt-openjdk-uber/2.5.1/conscrypt-openjdk-uber-2.5.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__org_threeten_threetenbp_1_5_2.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: org.threeten:threetenbp:1.5.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/threeten/threetenbp/1.5.2/threetenbp-1.5.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/threeten/threetenbp/1.5.2/threetenbp-1.5.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/threeten/threetenbp/1.5.2/threetenbp-1.5.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/misc.xml
+ 3
− 1
View file @ a0d1396f
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
......@@ -8,6 +7,9 @@
</list>
</option>
</component>
<component name="ProjectKey">
<option name="state" value="project://e2804f05-5315-4fc6-a121-c522a6c26470" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
......
.idea/modules.xml 0 → 100644
+ 8
− 0
View file @ a0d1396f
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/Bachelor_application.iml" filepath="$PROJECT_DIR$/Bachelor_application.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/shelf/Uncommitted_changes_before_rebase_[Changes]/shelved.patch 0 → 100644
+ 32
− 0
View file @ a0d1396f
Index: .idea/.gitignore
===================================================================
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
--- a/.idea/.gitignore (revision bf612e45b76fce5444faaa257112a1e684497c29)
+++ /dev/null (revision bf612e45b76fce5444faaa257112a1e684497c29)
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
Index: .idea/vcs.xml
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
--- /dev/null (date 1645110263019)
+++ b/.idea/vcs.xml (date 1645110263019)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
.idea/vcs.xml
+ 1
− 1
View file @ a0d1396f
<?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
Bachelor_application.iml 0 → 100644
+ 65
− 0
View file @ a0d1396f
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.google.cloud:google-cloud-bigqueryconnection:2.1.10" level="project" />
<orderEntry type="library" name="Maven: io.grpc:grpc-api:1.44.0" level="project" />
<orderEntry type="library" name="Maven: io.grpc:grpc-context:1.44.0" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: io.grpc:grpc-stub:1.44.0" level="project" />
<orderEntry type="library" name="Maven: io.grpc:grpc-protobuf:1.44.0" level="project" />
<orderEntry type="library" name="Maven: io.grpc:grpc-protobuf-lite:1.44.0" level="project" />
<orderEntry type="library" name="Maven: com.google.api:api-common:2.1.3" level="project" />
<orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.google.auto.value:auto-value-annotations:1.9" level="project" />
<orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:3.19.3" level="project" />
<orderEntry type="library" name="Maven: com.google.api.grpc:proto-google-common-protos:2.7.2" level="project" />
<orderEntry type="library" name="Maven: com.google.api.grpc:proto-google-iam-v1:1.2.1" level="project" />
<orderEntry type="library" name="Maven: com.google.api.grpc:proto-google-cloud-bigqueryconnection-v1:2.1.10" level="project" />
<orderEntry type="library" name="Maven: com.google.api.grpc:proto-google-cloud-bigqueryconnection-v1beta1:0.9.10" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:31.0.1-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.21.1" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.11.0" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: com.google.api:gax:2.11.0" level="project" />
<orderEntry type="library" name="Maven: com.google.auth:google-auth-library-credentials:1.4.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.google.auth:google-auth-library-oauth2-http:1.4.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.google.http-client:google-http-client:1.41.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: commons-codec:commons-codec:1.15" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.opencensus:opencensus-contrib-http-util:0.31.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.google.http-client:google-http-client-gson:1.41.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.opencensus:opencensus-api:0.31.0" level="project" />
<orderEntry type="library" name="Maven: com.google.api:gax-grpc:2.11.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.grpc:grpc-alts:1.44.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.grpc:grpc-grpclb:1.44.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.conscrypt:conscrypt-openjdk-uber:2.5.1" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.grpc:grpc-auth:1.44.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.grpc:grpc-netty-shaded:1.44.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.perfmark:perfmark-api:0.23.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.grpc:grpc-core:1.44.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.google.android:annotations:4.1.1.4" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.20" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.grpc:grpc-xds:1.44.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.grpc:grpc-services:1.44.0" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.google.re2j:re2j:1.5" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.67" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.bouncycastle:bcprov-jdk15on:1.67" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: io.opencensus:opencensus-proto:0.2.0" level="project" />
<orderEntry type="library" name="Maven: org.threeten:threetenbp:1.5.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.google.protobuf:protobuf-java-util:3.19.3" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
</component>
</module>
\ No newline at end of file
src/main/java/com/application/Main.java
+ 10
− 13
View file @ a0d1396f
package com.application;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.scene.control.Button;
import javafx.scene.layout.StackPane;
import javafx.stage.Stage;
import java.util.Objects;
public class Main extends Application {
Button button;
......@@ -23,19 +25,14 @@ public class Main extends Application {
@Override
public void start(Stage primaryStage) throws Exception {
// Sett title in top left of the stage
primaryStage.setTitle("Moelven Drying Application");
// Loading the GUI-fxml file from resources
Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("/com.application/test.fxml")));
// Creates a button
button = new Button();
button.setText("Click me");
button.setOnAction(e->System.out.println("Button was clicked"));
// Creates a stackpane, attaches the button to the
StackPane layout = new StackPane();
layout.getChildren().add(button);
Scene scene = new Scene(layout, 300, 250);
// Sets the scene and defines boundaries
Scene scene = new Scene(root, 1200, 600);
primaryStage.setMaximized(true);
primaryStage.setMinHeight(600);
primaryStage.setMinWidth(1200);
primaryStage.setScene(scene);
primaryStage.show();
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment