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 239 additions and 8 deletions
.gitignore 0 → 100644
+ 15
− 0
View file @ a0d1396f
# Default ignored files
/.idea/workspace.xml
/.idea/shelf/
/out/
/.idea/sonarlint
/.idea/vcs.xml
/dataSources/
/dataSources.local.xml
/vpproject/
/Contacts.vpdm/
/derby.log
/contactsdb/
/doc/
/contacts.log
/addressbook.dat
.idea/.gitignore deleted 100644 → 0
+ 0
− 8
View file @ c686a388
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
.idea/compiler.xml
+ 3
− 0
View file @ a0d1396f
......@@ -9,5 +9,8 @@
<module name="Bachelor_application" />
</profile>
</annotationProcessing>
<bytecodeTargetLevel>
<module name="Bachelor_application" target="8" />
</bytecodeTargetLevel>
</component>
</project>
\ No newline at end of file
.idea/libraries/Maven__com_google_android_annotations_4_1_1_4.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.android:annotations:4.1.1.4">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/android/annotations/4.1.1.4/annotations-4.1.1.4.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/android/annotations/4.1.1.4/annotations-4.1.1.4-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/android/annotations/4.1.1.4/annotations-4.1.1.4-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_google_api_api_common_2_1_3.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.api:api-common:2.1.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/api-common/2.1.3/api-common-2.1.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/api-common/2.1.3/api-common-2.1.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/api-common/2.1.3/api-common-2.1.3-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_google_api_gax_2_11_0.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.api:gax:2.11.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/gax/2.11.0/gax-2.11.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/gax/2.11.0/gax-2.11.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/gax/2.11.0/gax-2.11.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_google_api_gax_grpc_2_11_0.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.api:gax-grpc:2.11.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/gax-grpc/2.11.0/gax-grpc-2.11.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/gax-grpc/2.11.0/gax-grpc-2.11.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/gax-grpc/2.11.0/gax-grpc-2.11.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_google_api_grpc_proto_google_cloud_bigqueryconnection_v1_2_1_10.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.api.grpc:proto-google-cloud-bigqueryconnection-v1:2.1.10">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-cloud-bigqueryconnection-v1/2.1.10/proto-google-cloud-bigqueryconnection-v1-2.1.10.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-cloud-bigqueryconnection-v1/2.1.10/proto-google-cloud-bigqueryconnection-v1-2.1.10-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-cloud-bigqueryconnection-v1/2.1.10/proto-google-cloud-bigqueryconnection-v1-2.1.10-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_google_api_grpc_proto_google_cloud_bigqueryconnection_v1beta1_0_9_10.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.api.grpc:proto-google-cloud-bigqueryconnection-v1beta1:0.9.10">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-cloud-bigqueryconnection-v1beta1/0.9.10/proto-google-cloud-bigqueryconnection-v1beta1-0.9.10.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-cloud-bigqueryconnection-v1beta1/0.9.10/proto-google-cloud-bigqueryconnection-v1beta1-0.9.10-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-cloud-bigqueryconnection-v1beta1/0.9.10/proto-google-cloud-bigqueryconnection-v1beta1-0.9.10-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_google_api_grpc_proto_google_common_protos_2_7_2.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.api.grpc:proto-google-common-protos:2.7.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-common-protos/2.7.2/proto-google-common-protos-2.7.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-common-protos/2.7.2/proto-google-common-protos-2.7.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-common-protos/2.7.2/proto-google-common-protos-2.7.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_google_api_grpc_proto_google_iam_v1_1_2_1.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.api.grpc:proto-google-iam-v1:1.2.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-iam-v1/1.2.1/proto-google-iam-v1-1.2.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-iam-v1/1.2.1/proto-google-iam-v1-1.2.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/api/grpc/proto-google-iam-v1/1.2.1/proto-google-iam-v1-1.2.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_google_auth_google_auth_library_credentials_1_4_0.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.auth:google-auth-library-credentials:1.4.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/auth/google-auth-library-credentials/1.4.0/google-auth-library-credentials-1.4.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/auth/google-auth-library-credentials/1.4.0/google-auth-library-credentials-1.4.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/auth/google-auth-library-credentials/1.4.0/google-auth-library-credentials-1.4.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_google_auth_google_auth_library_oauth2_http_1_4_0.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.auth:google-auth-library-oauth2-http:1.4.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/auth/google-auth-library-oauth2-http/1.4.0/google-auth-library-oauth2-http-1.4.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/auth/google-auth-library-oauth2-http/1.4.0/google-auth-library-oauth2-http-1.4.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/auth/google-auth-library-oauth2-http/1.4.0/google-auth-library-oauth2-http-1.4.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_google_auto_value_auto_value_annotations_1_9.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.auto.value:auto-value-annotations:1.9">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/auto/value/auto-value-annotations/1.9/auto-value-annotations-1.9.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/auto/value/auto-value-annotations/1.9/auto-value-annotations-1.9-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/auto/value/auto-value-annotations/1.9/auto-value-annotations-1.9-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_google_cloud_google_cloud_bigqueryconnection_2_1_10.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.cloud:google-cloud-bigqueryconnection:2.1.10">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/cloud/google-cloud-bigqueryconnection/2.1.10/google-cloud-bigqueryconnection-2.1.10.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/cloud/google-cloud-bigqueryconnection/2.1.10/google-cloud-bigqueryconnection-2.1.10-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/cloud/google-cloud-bigqueryconnection/2.1.10/google-cloud-bigqueryconnection-2.1.10-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_google_code_findbugs_jsr305_3_0_2.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.code.findbugs:jsr305:3.0.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_google_code_gson_gson_2_8_9.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.code.gson:gson:2.8.9">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.9/gson-2.8.9.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.9/gson-2.8.9-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.9/gson-2.8.9-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_google_errorprone_error_prone_annotations_2_11_0.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.errorprone:error_prone_annotations:2.11.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.11.0/error_prone_annotations-2.11.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_google_guava_failureaccess_1_0_1.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.guava:failureaccess:1.0.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Maven__com_google_guava_guava_31_0_1_jre.xml 0 → 100644
+ 13
− 0
View file @ a0d1396f
<component name="libraryTable">
<library name="Maven: com.google.guava:guava:31.0.1-jre">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
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