diff --git a/.gitignore b/.gitignore
index 46e6013345adc13be8d2050abb32c7a53b430565..240a234c67bd834019d85ee7ac27333447500a99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,12 +3,12 @@
target/
.idea/
-*.properties
*.iml
bin/
.settings/
.classpath
.project
+t14-test-images
# User-specific stuff
.idea/**/workspace.xml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 89a282addf3b3e17a124a4db8f6867fb444f0d44..a292b1db762c7739463c018d559b2af67b0a381f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,18 +4,22 @@ stages:
- build
- test
-cache:
- paths:
- - target/
-
build:
stage: build
+ only:
+ - dev
+ - master
+ - merge_requests
script:
- echo "Building project with maven"
- mvn verify
test:
stage: test
+ only:
+ - dev
+ - master
+ - merge_requests
script:
- echo "Running project tests with maven"
- mvn test
diff --git a/import.sql.gz b/import.sql.gz
new file mode 100644
index 0000000000000000000000000000000000000000..2c41c2ac96e5fbf1dd76445483ac3b601e3b96d9
Binary files /dev/null and b/import.sql.gz differ
diff --git a/javadoc/NTNU/IDATT1002/App.html b/javadoc/NTNU/IDATT1002/App.html
index 6f1204406f061f14b94749d034fa0697a4b2fe8d..9fe4d43317803c5624cc51ac8e299aed99a4ac2d 100644
--- a/javadoc/NTNU/IDATT1002/App.html
+++ b/javadoc/NTNU/IDATT1002/App.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>App</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../../script.js"></script>
@@ -96,7 +96,7 @@ loadScripts(document, 'script');</script>
</ul>
<ul class="subNavList">
<li>Detail: </li>
-<li>Field | </li>
+<li><a href="#field.detail">Field</a> | </li>
<li><a href="#constructor.detail">Constr</a> | </li>
<li><a href="#method.detail">Method</a></li>
</ul>
@@ -169,6 +169,19 @@ extends javafx.application.Application</pre>
<!-- -->
</a>
<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static <a href="controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#ex">ex</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
<ul class="blockList">
<li class="blockList"><a id="fields.inherited.from.class.javafx.application.Application">
<!-- -->
@@ -253,6 +266,25 @@ extends javafx.application.Application</pre>
<div class="details">
<ul class="blockList">
<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="ex">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ex</h4>
+<pre>public static <a href="controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a> ex</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<section role="region">
<ul class="blockList">
@@ -376,7 +408,7 @@ extends javafx.application.Application</pre>
</ul>
<ul class="subNavList">
<li>Detail: </li>
-<li>Field | </li>
+<li><a href="#field.detail">Field</a> | </li>
<li><a href="#constructor.detail">Constr</a> | </li>
<li><a href="#method.detail">Method</a></li>
</ul>
diff --git a/javadoc/NTNU/IDATT1002/ApplicationState.html b/javadoc/NTNU/IDATT1002/ApplicationState.html
new file mode 100644
index 0000000000000000000000000000000000000000..85f7b415f710c8f90cfe68673f5b0afa0538a6d3
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/ApplicationState.html
@@ -0,0 +1,329 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>ApplicationState</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../script.js"></script>
+<script type="text/javascript" src="../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="ApplicationState";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002</a></div>
+<h2 title="Class ApplicationState" class="title">Class ApplicationState</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.ApplicationState</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public final class <span class="typeNameLabel">ApplicationState</span>
+extends java.lang.Object</pre>
+<div class="block">Class Application State. Keeps a record of the global application state, such as the current logged in user.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">ApplicationState</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static <a href="models/User.html" title="class in NTNU.IDATT1002.models">User</a></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getCurrentUser()">getCurrentUser</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Retrieve the current logged in user if present, or retrieve an anonymous user.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setCurrentUser(NTNU.IDATT1002.models.User)">setCurrentUser</a></span>​(<a href="models/User.html" title="class in NTNU.IDATT1002.models">User</a> currentUser)</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ApplicationState</h4>
+<pre>public ApplicationState()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="setCurrentUser(NTNU.IDATT1002.models.User)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setCurrentUser</h4>
+<pre class="methodSignature">public static void setCurrentUser​(<a href="models/User.html" title="class in NTNU.IDATT1002.models">User</a> currentUser)</pre>
+</li>
+</ul>
+<a id="getCurrentUser()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getCurrentUser</h4>
+<pre class="methodSignature">public static <a href="models/User.html" title="class in NTNU.IDATT1002.models">User</a> getCurrentUser()</pre>
+<div class="block">Retrieve the current logged in user if present, or retrieve an anonymous user.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the current user.</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.lang.IllegalArgumentException</code> - if neither the current user nor the anonymous user are present.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../index-files/index-1.html">Index</a></li>
+<li><a href="../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/controllers/CreateAlbum.html b/javadoc/NTNU/IDATT1002/controllers/CreateAlbum.html
new file mode 100644
index 0000000000000000000000000000000000000000..30fe158f5166a3a1194bd6ac6ae7319f26c40ce7
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/controllers/CreateAlbum.html
@@ -0,0 +1,683 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>CreateAlbum</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="CreateAlbum";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.controllers</a></div>
+<h2 title="Class CreateAlbum" class="title">Class CreateAlbum</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.controllers.CreateAlbum</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">CreateAlbum</span>
+extends java.lang.Object</pre>
+<div class="block">Controls the buttons and changeable elements on create_album.fxml,
+ a page where you create albums</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#add_images_button">add_images_button</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextArea</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#album_desc_field">album_desc_field</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#album_tag_field">album_tag_field</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#album_title_field">album_title_field</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#create_album_button">create_album_button</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.layout.GridPane</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#image_grid">image_grid</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.layout.Pane</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#metadata_pane">metadata_pane</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_albums">tbar_albums</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_explore">tbar_explore</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_logo">tbar_logo</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_map">tbar_map</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_search">tbar_search</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_searchBtn">tbar_searchBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_upload">tbar_upload</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">CreateAlbum</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createEmptyAlbum(javafx.event.ActionEvent)">createEmptyAlbum</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Create an empty album.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes stage to Albums page</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToExplore(javafx.event.ActionEvent)">switchToExplore</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes stage to Explore page</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMain(javafx.scene.input.MouseEvent)">switchToMain</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes stage to Main page</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMap(javafx.event.ActionEvent)">switchToMap</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes stage to Map page</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToSearch(javafx.event.ActionEvent)">switchToSearch</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes stage to Search page.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToUpload(javafx.event.ActionEvent)">switchToUpload</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes stage to Upload page</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="tbar_search">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_search</h4>
+<pre>public javafx.scene.control.TextField tbar_search</pre>
+</li>
+</ul>
+<a id="tbar_logo">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_logo</h4>
+<pre>public javafx.scene.image.ImageView tbar_logo</pre>
+</li>
+</ul>
+<a id="tbar_explore">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_explore</h4>
+<pre>public javafx.scene.control.Button tbar_explore</pre>
+</li>
+</ul>
+<a id="tbar_map">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_map</h4>
+<pre>public javafx.scene.control.Button tbar_map</pre>
+</li>
+</ul>
+<a id="tbar_upload">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_upload</h4>
+<pre>public javafx.scene.control.Button tbar_upload</pre>
+</li>
+</ul>
+<a id="album_title_field">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>album_title_field</h4>
+<pre>public javafx.scene.control.TextField album_title_field</pre>
+</li>
+</ul>
+<a id="album_tag_field">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>album_tag_field</h4>
+<pre>public javafx.scene.control.TextField album_tag_field</pre>
+</li>
+</ul>
+<a id="album_desc_field">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>album_desc_field</h4>
+<pre>public javafx.scene.control.TextArea album_desc_field</pre>
+</li>
+</ul>
+<a id="metadata_pane">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>metadata_pane</h4>
+<pre>public javafx.scene.layout.Pane metadata_pane</pre>
+</li>
+</ul>
+<a id="image_grid">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>image_grid</h4>
+<pre>public javafx.scene.layout.GridPane image_grid</pre>
+</li>
+</ul>
+<a id="add_images_button">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>add_images_button</h4>
+<pre>public javafx.scene.control.Button add_images_button</pre>
+</li>
+</ul>
+<a id="create_album_button">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>create_album_button</h4>
+<pre>public javafx.scene.control.Button create_album_button</pre>
+</li>
+</ul>
+<a id="tbar_albums">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_albums</h4>
+<pre>public javafx.scene.control.Button tbar_albums</pre>
+</li>
+</ul>
+<a id="tbar_searchBtn">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>tbar_searchBtn</h4>
+<pre>public javafx.scene.control.Button tbar_searchBtn</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>CreateAlbum</h4>
+<pre>public CreateAlbum()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="switchToMain(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMain</h4>
+<pre class="methodSignature">public void switchToMain​(javafx.scene.input.MouseEvent mouseEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes stage to Main page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>mouseEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToSearch(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToSearch</h4>
+<pre class="methodSignature">public void switchToSearch​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes stage to Search page. It reads the value of the search
+ field and if not empty it is passed to dataexchange</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToExplore(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToExplore</h4>
+<pre class="methodSignature">public void switchToExplore​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes stage to Explore page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToAlbums(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToAlbums</h4>
+<pre class="methodSignature">public void switchToAlbums​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes stage to Albums page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToMap(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMap</h4>
+<pre class="methodSignature">public void switchToMap​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes stage to Map page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToUpload(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToUpload</h4>
+<pre class="methodSignature">public void switchToUpload​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes stage to Upload page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - the mouse has done something</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code> - this page does not exist</dd>
+</dl>
+</li>
+</ul>
+<a id="createEmptyAlbum(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>createEmptyAlbum</h4>
+<pre class="methodSignature">public void createEmptyAlbum​(javafx.event.ActionEvent actionEvent)</pre>
+<div class="block">Create an empty album. The user will default to the currently logged in user.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/controllers/DataExchange.html b/javadoc/NTNU/IDATT1002/controllers/DataExchange.html
new file mode 100644
index 0000000000000000000000000000000000000000..72e300a64792cdd8b0a365b0b1b459fa245db2a8
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/controllers/DataExchange.html
@@ -0,0 +1,503 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>DataExchange</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="DataExchange";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.controllers</a></div>
+<h2 title="Class DataExchange" class="title">Class DataExchange</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.controllers.DataExchange</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">DataExchange</span>
+extends java.lang.Object</pre>
+<div class="block">Class for storing temporary variables between controllers,
+ when the scene changes</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.application.HostServices</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#hostServices">hostServices</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">DataExchange</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.lang.Long</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getChosenAlbumId()">getChosenAlbumId</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getChosenImg()">getChosenImg</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>javax.persistence.EntityManager</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getEntityManager()">getEntityManager</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>javafx.application.HostServices</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getHostServices()">getHostServices</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getSearchField()">getSearchField</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.util.List<java.io.File></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getUploadedFiles()">getUploadedFiles</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setChosenAlbumId(java.lang.Long)">setChosenAlbumId</a></span>​(java.lang.Long chosenAlbumId)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setChosenImg(java.lang.String)">setChosenImg</a></span>​(java.lang.String chosenImg)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setEntityManager(javax.persistence.EntityManager)">setEntityManager</a></span>​(javax.persistence.EntityManager entityManager)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setHostServices(javafx.application.HostServices)">setHostServices</a></span>​(javafx.application.HostServices hostServices)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setSearchField(java.lang.String)">setSearchField</a></span>​(java.lang.String searchField)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setUploadedFiles(java.util.List)">setUploadedFiles</a></span>​(java.util.List<java.io.File> uploadedFiles)</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="hostServices">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>hostServices</h4>
+<pre>public javafx.application.HostServices hostServices</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>DataExchange</h4>
+<pre>public DataExchange()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="getEntityManager()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getEntityManager</h4>
+<pre class="methodSignature">public javax.persistence.EntityManager getEntityManager()</pre>
+</li>
+</ul>
+<a id="getHostServices()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getHostServices</h4>
+<pre class="methodSignature">public javafx.application.HostServices getHostServices()</pre>
+</li>
+</ul>
+<a id="getUploadedFiles()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getUploadedFiles</h4>
+<pre class="methodSignature">public java.util.List<java.io.File> getUploadedFiles()</pre>
+</li>
+</ul>
+<a id="getSearchField()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getSearchField</h4>
+<pre class="methodSignature">public java.lang.String getSearchField()</pre>
+</li>
+</ul>
+<a id="getChosenAlbumId()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getChosenAlbumId</h4>
+<pre class="methodSignature">public java.lang.Long getChosenAlbumId()</pre>
+</li>
+</ul>
+<a id="getChosenImg()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getChosenImg</h4>
+<pre class="methodSignature">public java.lang.String getChosenImg()</pre>
+</li>
+</ul>
+<a id="setEntityManager(javax.persistence.EntityManager)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setEntityManager</h4>
+<pre class="methodSignature">public void setEntityManager​(javax.persistence.EntityManager entityManager)</pre>
+</li>
+</ul>
+<a id="setHostServices(javafx.application.HostServices)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setHostServices</h4>
+<pre class="methodSignature">public void setHostServices​(javafx.application.HostServices hostServices)</pre>
+</li>
+</ul>
+<a id="setUploadedFiles(java.util.List)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setUploadedFiles</h4>
+<pre class="methodSignature">public void setUploadedFiles​(java.util.List<java.io.File> uploadedFiles)</pre>
+</li>
+</ul>
+<a id="setSearchField(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setSearchField</h4>
+<pre class="methodSignature">public void setSearchField​(java.lang.String searchField)</pre>
+</li>
+</ul>
+<a id="setChosenAlbumId(java.lang.Long)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setChosenAlbumId</h4>
+<pre class="methodSignature">public void setChosenAlbumId​(java.lang.Long chosenAlbumId)</pre>
+</li>
+</ul>
+<a id="setChosenImg(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setChosenImg</h4>
+<pre class="methodSignature">public void setChosenImg​(java.lang.String chosenImg)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/controllers/Explore.html b/javadoc/NTNU/IDATT1002/controllers/Explore.html
new file mode 100644
index 0000000000000000000000000000000000000000..43255285093eb9f6acac0af4f22ff4f850277965
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/controllers/Explore.html
@@ -0,0 +1,725 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>Explore</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Explore";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.controllers</a></div>
+<h2 title="Class Explore" class="title">Class Explore</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.controllers.Explore</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><code>javafx.fxml.Initializable</code></dd>
+</dl>
+<hr>
+<pre>public class <span class="typeNameLabel">Explore</span>
+extends java.lang.Object
+implements javafx.fxml.Initializable</pre>
+<div class="block">Controls the buttons and changeable elements on explore.fxml,
+ a page where you explore images</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#footer_nextBtn">footer_nextBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#footer_previousBtn">footer_previousBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.layout.GridPane</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#gridPane">gridPane</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.ScrollPane</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#scrollPane">scrollPane</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_albums">tbar_albums</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_explore">tbar_explore</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_logo">tbar_logo</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_map">tbar_map</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_search">tbar_search</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_searchBtn">tbar_searchBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_upload">tbar_upload</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">Explore</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#initialize(java.net.URL,java.util.ResourceBundle)">initialize</a></span>​(java.net.URL url,
+ java.util.ResourceBundle resourceBundle)</code></th>
+<td class="colLast">
+<div class="block">Method that runs when explore.fxml is set as scene
+ Generates content based on a list of images</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Albums page</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToExplore(javafx.event.ActionEvent)">switchToExplore</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Explore page</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMain(javafx.scene.input.MouseEvent)">switchToMain</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Main page</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMap(javafx.event.ActionEvent)">switchToMap</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Map page</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToNext(javafx.event.ActionEvent)">switchToNext</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that updates content to next "page"</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToPicture(javafx.scene.input.MouseEvent)">switchToPicture</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to View Picture page for the image that was clicked</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToPrevious(javafx.event.ActionEvent)">switchToPrevious</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that updates content to previous "page"</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToSearch(javafx.event.ActionEvent)">switchToSearch</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Search page.</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToUpload(javafx.event.ActionEvent)">switchToUpload</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Upload page</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="tbar_logo">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_logo</h4>
+<pre>public javafx.scene.image.ImageView tbar_logo</pre>
+</li>
+</ul>
+<a id="tbar_search">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_search</h4>
+<pre>public javafx.scene.control.TextField tbar_search</pre>
+</li>
+</ul>
+<a id="tbar_searchBtn">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_searchBtn</h4>
+<pre>public javafx.scene.control.Button tbar_searchBtn</pre>
+</li>
+</ul>
+<a id="tbar_explore">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_explore</h4>
+<pre>public javafx.scene.control.Button tbar_explore</pre>
+</li>
+</ul>
+<a id="tbar_map">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_map</h4>
+<pre>public javafx.scene.control.Button tbar_map</pre>
+</li>
+</ul>
+<a id="tbar_upload">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_upload</h4>
+<pre>public javafx.scene.control.Button tbar_upload</pre>
+</li>
+</ul>
+<a id="tbar_albums">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_albums</h4>
+<pre>public javafx.scene.control.Button tbar_albums</pre>
+</li>
+</ul>
+<a id="scrollPane">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>scrollPane</h4>
+<pre>public javafx.scene.control.ScrollPane scrollPane</pre>
+</li>
+</ul>
+<a id="gridPane">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>gridPane</h4>
+<pre>public javafx.scene.layout.GridPane gridPane</pre>
+</li>
+</ul>
+<a id="footer_previousBtn">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>footer_previousBtn</h4>
+<pre>public javafx.scene.control.Button footer_previousBtn</pre>
+</li>
+</ul>
+<a id="footer_nextBtn">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>footer_nextBtn</h4>
+<pre>public javafx.scene.control.Button footer_nextBtn</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Explore</h4>
+<pre>public Explore()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="initialize(java.net.URL,java.util.ResourceBundle)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>initialize</h4>
+<pre class="methodSignature">public void initialize​(java.net.URL url,
+ java.util.ResourceBundle resourceBundle)</pre>
+<div class="block">Method that runs when explore.fxml is set as scene
+ Generates content based on a list of images</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>initialize</code> in interface <code>javafx.fxml.Initializable</code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>url</code> - </dd>
+<dd><code>resourceBundle</code> - </dd>
+</dl>
+</li>
+</ul>
+<a id="switchToMain(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMain</h4>
+<pre class="methodSignature">public void switchToMain​(javafx.scene.input.MouseEvent mouseEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Main page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>mouseEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToSearch(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToSearch</h4>
+<pre class="methodSignature">public void switchToSearch​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Search page. It reads the value of the search
+ field and if not empty it is passed to dataexchange</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToExplore(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToExplore</h4>
+<pre class="methodSignature">public void switchToExplore​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Explore page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToAlbums(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToAlbums</h4>
+<pre class="methodSignature">public void switchToAlbums​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Albums page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToMap(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMap</h4>
+<pre class="methodSignature">public void switchToMap​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Map page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToUpload(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToUpload</h4>
+<pre class="methodSignature">public void switchToUpload​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Upload page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - the mouse has done something</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code> - this page does not exist</dd>
+</dl>
+</li>
+</ul>
+<a id="switchToPicture(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToPicture</h4>
+<pre class="methodSignature">public void switchToPicture​(javafx.scene.input.MouseEvent mouseEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to View Picture page for the image that was clicked</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>mouseEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToPrevious(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToPrevious</h4>
+<pre class="methodSignature">public void switchToPrevious​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that updates content to previous "page"</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToNext(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>switchToNext</h4>
+<pre class="methodSignature">public void switchToNext​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that updates content to next "page"</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/controllers/ExploreAlbums.html b/javadoc/NTNU/IDATT1002/controllers/ExploreAlbums.html
new file mode 100644
index 0000000000000000000000000000000000000000..f1273511acc1e5752b5637c12010e6d2ecd5e173
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/controllers/ExploreAlbums.html
@@ -0,0 +1,777 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>ExploreAlbums</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="ExploreAlbums";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.controllers</a></div>
+<h2 title="Class ExploreAlbums" class="title">Class ExploreAlbums</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.controllers.ExploreAlbums</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><code>javafx.fxml.Initializable</code></dd>
+</dl>
+<hr>
+<pre>public class <span class="typeNameLabel">ExploreAlbums</span>
+extends java.lang.Object
+implements javafx.fxml.Initializable</pre>
+<div class="block">Controls the buttons and changeable elements on explore_albums.fxml,
+ a page where you explore albums</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.text.Text</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#albumAmount">albumAmount</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#albumImage">albumImage</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createAlbumButton">createAlbumButton</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.ScrollPane</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#scrollpane">scrollpane</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.ChoiceBox</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#sortedByChoicebox">sortedByChoicebox</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_albums">tbar_albums</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_explore">tbar_explore</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_logo">tbar_logo</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_map">tbar_map</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_search">tbar_search</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_searchBtn">tbar_searchBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_upload">tbar_upload</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.layout.VBox</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#vBox">vBox</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">ExploreAlbums</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#initialize(java.net.URL,java.util.ResourceBundle)">initialize</a></span>​(java.net.URL url,
+ java.util.ResourceBundle resourceBundle)</code></th>
+<td class="colLast">
+<div class="block">Initialize page with all albums.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Albums page</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToCreateAlbum(javafx.event.ActionEvent)">switchToCreateAlbum</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Create Album page</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToExplore(javafx.event.ActionEvent)">switchToExplore</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Explore page</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMain(javafx.scene.input.MouseEvent)">switchToMain</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Main page</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMap(javafx.event.ActionEvent)">switchToMap</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Map page</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToNext(javafx.event.ActionEvent)">switchToNext</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that updates content to next "page"</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToPrevious(javafx.event.ActionEvent)">switchToPrevious</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that updates content to previous "page"</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToSearch(javafx.event.ActionEvent)">switchToSearch</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Search page.</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToUpload(javafx.event.ActionEvent)">switchToUpload</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Upload page</div>
+</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToViewAlbum(javafx.scene.input.MouseEvent)">switchToViewAlbum</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast">
+<div class="block">Method to open specific albums.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="tbar_logo">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_logo</h4>
+<pre>public javafx.scene.image.ImageView tbar_logo</pre>
+</li>
+</ul>
+<a id="tbar_search">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_search</h4>
+<pre>public javafx.scene.control.TextField tbar_search</pre>
+</li>
+</ul>
+<a id="tbar_map">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_map</h4>
+<pre>public javafx.scene.control.Button tbar_map</pre>
+</li>
+</ul>
+<a id="tbar_upload">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_upload</h4>
+<pre>public javafx.scene.control.Button tbar_upload</pre>
+</li>
+</ul>
+<a id="tbar_albums">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_albums</h4>
+<pre>public javafx.scene.control.Button tbar_albums</pre>
+</li>
+</ul>
+<a id="tbar_searchBtn">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_searchBtn</h4>
+<pre>public javafx.scene.control.Button tbar_searchBtn</pre>
+</li>
+</ul>
+<a id="tbar_explore">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_explore</h4>
+<pre>public javafx.scene.control.Button tbar_explore</pre>
+</li>
+</ul>
+<a id="scrollpane">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>scrollpane</h4>
+<pre>public javafx.scene.control.ScrollPane scrollpane</pre>
+</li>
+</ul>
+<a id="albumAmount">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>albumAmount</h4>
+<pre>public javafx.scene.text.Text albumAmount</pre>
+</li>
+</ul>
+<a id="sortedByChoicebox">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>sortedByChoicebox</h4>
+<pre>public javafx.scene.control.ChoiceBox sortedByChoicebox</pre>
+</li>
+</ul>
+<a id="createAlbumButton">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createAlbumButton</h4>
+<pre>public javafx.scene.control.Button createAlbumButton</pre>
+</li>
+</ul>
+<a id="albumImage">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>albumImage</h4>
+<pre>public javafx.scene.image.ImageView albumImage</pre>
+</li>
+</ul>
+<a id="vBox">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>vBox</h4>
+<pre>public javafx.scene.layout.VBox vBox</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ExploreAlbums</h4>
+<pre>public ExploreAlbums()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="initialize(java.net.URL,java.util.ResourceBundle)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>initialize</h4>
+<pre class="methodSignature">public void initialize​(java.net.URL url,
+ java.util.ResourceBundle resourceBundle)</pre>
+<div class="block">Initialize page with all albums. Max 50 per page.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>initialize</code> in interface <code>javafx.fxml.Initializable</code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>url</code> - </dd>
+<dd><code>resourceBundle</code> - </dd>
+</dl>
+</li>
+</ul>
+<a id="switchToMain(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMain</h4>
+<pre class="methodSignature">public void switchToMain​(javafx.scene.input.MouseEvent mouseEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Main page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>mouseEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToSearch(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToSearch</h4>
+<pre class="methodSignature">public void switchToSearch​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Search page. It reads the value of the search
+ field and if not empty it is passed to dataexchange</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToExplore(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToExplore</h4>
+<pre class="methodSignature">public void switchToExplore​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Explore page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToAlbums(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToAlbums</h4>
+<pre class="methodSignature">public void switchToAlbums​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Albums page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToMap(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMap</h4>
+<pre class="methodSignature">public void switchToMap​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Map page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToUpload(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToUpload</h4>
+<pre class="methodSignature">public void switchToUpload​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Upload page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - the mouse has done something</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code> - this page does not exist</dd>
+</dl>
+</li>
+</ul>
+<a id="switchToCreateAlbum(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToCreateAlbum</h4>
+<pre class="methodSignature">public void switchToCreateAlbum​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Create Album page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - the mouse has done something</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code> - this page does not exist</dd>
+</dl>
+</li>
+</ul>
+<a id="switchToPrevious(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToPrevious</h4>
+<pre class="methodSignature">public void switchToPrevious​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that updates content to previous "page"</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToNext(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToNext</h4>
+<pre class="methodSignature">public void switchToNext​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that updates content to next "page"</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToViewAlbum(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>switchToViewAlbum</h4>
+<pre class="methodSignature">public void switchToViewAlbum​(javafx.scene.input.MouseEvent mouseEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method to open specific albums. It takes a clicked element within an album container
+ and finds the fx:id of the main parent, (who's id is the same as the album in the database), and
+ passes the value to Data Exchange so that Image View will know which album was clicked</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>mouseEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/controllers/ExploreController.html b/javadoc/NTNU/IDATT1002/controllers/ExploreController.html
index 6ce530c48e1914b846ecdbb49c1d72bd1898227f..c0abd3ce8b1d15dba3ecc32898ddb67fbd1e9f3e 100644
--- a/javadoc/NTNU/IDATT1002/controllers/ExploreController.html
+++ b/javadoc/NTNU/IDATT1002/controllers/ExploreController.html
@@ -124,7 +124,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
-<li>NTNU.IDATT1002.controllers.ExploreController</li>
+<li>NTNU.IDATT1002.controllers.Explore</li>
</ul>
</li>
</ul>
diff --git a/javadoc/NTNU/IDATT1002/controllers/LoggedInController.html b/javadoc/NTNU/IDATT1002/controllers/LoggedInController.html
index 195b2e81c30dfc58ae8e90ddffb77b2af1b7f152..9be724a54ec170a5e16f06c313e678e2a6faaf76 100644
--- a/javadoc/NTNU/IDATT1002/controllers/LoggedInController.html
+++ b/javadoc/NTNU/IDATT1002/controllers/LoggedInController.html
@@ -124,7 +124,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
-<li>NTNU.IDATT1002.controllers.LoggedInController</li>
+<li>NTNU.IDATT1002.controllers.Main</li>
</ul>
</li>
</ul>
diff --git a/javadoc/NTNU/IDATT1002/controllers/Login.html b/javadoc/NTNU/IDATT1002/controllers/Login.html
new file mode 100644
index 0000000000000000000000000000000000000000..6a23f9d8dff3b613335fb6e9677eee555c70c315
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/controllers/Login.html
@@ -0,0 +1,425 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>Login</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Login";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.controllers</a></div>
+<h2 title="Class Login" class="title">Class Login</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.controllers.Login</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">Login</span>
+extends java.lang.Object</pre>
+<div class="block">Controls the buttons and changeable elements on login.fxml,
+ the page where you log into the application</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#login">login</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.PasswordField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#Password">Password</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#signup">signup</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#Username">Username</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">Login</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#login(javafx.event.ActionEvent)">login</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Main page</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToSignup(javafx.event.ActionEvent)">switchToSignup</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Sign Up page</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="Username">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Username</h4>
+<pre>public javafx.scene.control.TextField Username</pre>
+</li>
+</ul>
+<a id="Password">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Password</h4>
+<pre>public javafx.scene.control.PasswordField Password</pre>
+</li>
+</ul>
+<a id="signup">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>signup</h4>
+<pre>public javafx.scene.control.Button signup</pre>
+</li>
+</ul>
+<a id="login">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>login</h4>
+<pre>public javafx.scene.control.Button login</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Login</h4>
+<pre>public Login()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="switchToSignup(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToSignup</h4>
+<pre class="methodSignature">public void switchToSignup​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Sign Up page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="login(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>login</h4>
+<pre class="methodSignature">public void login​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Main page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/controllers/LoginController.html b/javadoc/NTNU/IDATT1002/controllers/LoginController.html
index 9e33576f0739ca133ce7debe6792f1552736ac61..18b4da4fb010175fd87e0b257b0e678ef019b9d1 100644
--- a/javadoc/NTNU/IDATT1002/controllers/LoginController.html
+++ b/javadoc/NTNU/IDATT1002/controllers/LoginController.html
@@ -124,7 +124,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
-<li>NTNU.IDATT1002.controllers.LoginController</li>
+<li>NTNU.IDATT1002.controllers.Login</li>
</ul>
</li>
</ul>
diff --git a/javadoc/NTNU/IDATT1002/controllers/Main.html b/javadoc/NTNU/IDATT1002/controllers/Main.html
new file mode 100644
index 0000000000000000000000000000000000000000..7fc4c484dd7e64f8aeb8b7799e2123f4aaf1531a
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/controllers/Main.html
@@ -0,0 +1,578 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>Main</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Main";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.controllers</a></div>
+<h2 title="Class Main" class="title">Class Main</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.controllers.Main</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">Main</span>
+extends java.lang.Object</pre>
+<div class="block">Controls the buttons and changeable elements on main.fxml,
+ a page where you explore albums</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_albums">tbar_albums</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_explore">tbar_explore</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_logo">tbar_logo</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_map">tbar_map</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_search">tbar_search</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_searchBtn">tbar_searchBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_upload">tbar_upload</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#uploadBtn">uploadBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">Main</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Albums page</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToExplore(javafx.event.ActionEvent)">switchToExplore</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Explore page</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMain(javafx.scene.input.MouseEvent)">switchToMain</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Main page</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMap(javafx.event.ActionEvent)">switchToMap</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Map page</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToSearch(javafx.event.ActionEvent)">switchToSearch</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Search page.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToUpload(javafx.event.ActionEvent)">switchToUpload</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Upload page</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="tbar_logo">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_logo</h4>
+<pre>public javafx.scene.image.ImageView tbar_logo</pre>
+</li>
+</ul>
+<a id="tbar_search">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_search</h4>
+<pre>public javafx.scene.control.TextField tbar_search</pre>
+</li>
+</ul>
+<a id="tbar_searchBtn">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_searchBtn</h4>
+<pre>public javafx.scene.control.Button tbar_searchBtn</pre>
+</li>
+</ul>
+<a id="tbar_explore">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_explore</h4>
+<pre>public javafx.scene.control.Button tbar_explore</pre>
+</li>
+</ul>
+<a id="tbar_map">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_map</h4>
+<pre>public javafx.scene.control.Button tbar_map</pre>
+</li>
+</ul>
+<a id="tbar_upload">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_upload</h4>
+<pre>public javafx.scene.control.Button tbar_upload</pre>
+</li>
+</ul>
+<a id="uploadBtn">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>uploadBtn</h4>
+<pre>public javafx.scene.control.Button uploadBtn</pre>
+</li>
+</ul>
+<a id="tbar_albums">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>tbar_albums</h4>
+<pre>public javafx.scene.control.Button tbar_albums</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Main</h4>
+<pre>public Main()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="switchToMain(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMain</h4>
+<pre class="methodSignature">public void switchToMain​(javafx.scene.input.MouseEvent mouseEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Main page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>mouseEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToSearch(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToSearch</h4>
+<pre class="methodSignature">public void switchToSearch​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Search page. It reads the value of the search
+ field and if not empty it is passed to dataexchange</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToExplore(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToExplore</h4>
+<pre class="methodSignature">public void switchToExplore​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Explore page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToAlbums(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToAlbums</h4>
+<pre class="methodSignature">public void switchToAlbums​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Albums page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToMap(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMap</h4>
+<pre class="methodSignature">public void switchToMap​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Map page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToUpload(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>switchToUpload</h4>
+<pre class="methodSignature">public void switchToUpload​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Upload page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - the mouse has done something</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code> - this page does not exist</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/controllers/Map.html b/javadoc/NTNU/IDATT1002/controllers/Map.html
new file mode 100644
index 0000000000000000000000000000000000000000..4e6f93d235d5fcd68604522124a137a222212cc6
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/controllers/Map.html
@@ -0,0 +1,613 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>Map</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Map";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.controllers</a></div>
+<h2 title="Class Map" class="title">Class Map</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.controllers.Map</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">Map</span>
+extends java.lang.Object</pre>
+<div class="block">Controls the buttons and changeable elements on map.fxml,
+ a page where you can find images by location</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#search">search</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#searchBtn">searchBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_albums">tbar_albums</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_explore">tbar_explore</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_logo">tbar_logo</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_map">tbar_map</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_search">tbar_search</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_searchBtn">tbar_searchBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_upload">tbar_upload</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">Map</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#MapSearch(javafx.event.ActionEvent)">MapSearch</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that searches for images on a specific place</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Albums page</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToExplore(javafx.event.ActionEvent)">switchToExplore</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Explore page</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMain(javafx.scene.input.MouseEvent)">switchToMain</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Main page</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMap(javafx.event.ActionEvent)">switchToMap</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Map page</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToSearch(javafx.event.ActionEvent)">switchToSearch</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Search page.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToUpload(javafx.event.ActionEvent)">switchToUpload</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Upload page</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="tbar_logo">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_logo</h4>
+<pre>public javafx.scene.image.ImageView tbar_logo</pre>
+</li>
+</ul>
+<a id="tbar_search">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_search</h4>
+<pre>public javafx.scene.control.TextField tbar_search</pre>
+</li>
+</ul>
+<a id="tbar_searchBtn">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_searchBtn</h4>
+<pre>public javafx.scene.control.Button tbar_searchBtn</pre>
+</li>
+</ul>
+<a id="tbar_explore">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_explore</h4>
+<pre>public javafx.scene.control.Button tbar_explore</pre>
+</li>
+</ul>
+<a id="tbar_map">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_map</h4>
+<pre>public javafx.scene.control.Button tbar_map</pre>
+</li>
+</ul>
+<a id="tbar_upload">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_upload</h4>
+<pre>public javafx.scene.control.Button tbar_upload</pre>
+</li>
+</ul>
+<a id="search">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>search</h4>
+<pre>public javafx.scene.control.TextField search</pre>
+</li>
+</ul>
+<a id="searchBtn">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>searchBtn</h4>
+<pre>public javafx.scene.control.Button searchBtn</pre>
+</li>
+</ul>
+<a id="tbar_albums">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>tbar_albums</h4>
+<pre>public javafx.scene.control.Button tbar_albums</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Map</h4>
+<pre>public Map()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="switchToMain(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMain</h4>
+<pre class="methodSignature">public void switchToMain​(javafx.scene.input.MouseEvent mouseEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Main page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>mouseEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToSearch(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToSearch</h4>
+<pre class="methodSignature">public void switchToSearch​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Search page. It reads the value of the search
+ field and if not empty it is passed to dataexchange</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToExplore(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToExplore</h4>
+<pre class="methodSignature">public void switchToExplore​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Explore page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToAlbums(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToAlbums</h4>
+<pre class="methodSignature">public void switchToAlbums​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Albums page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToMap(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMap</h4>
+<pre class="methodSignature">public void switchToMap​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Map page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToUpload(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToUpload</h4>
+<pre class="methodSignature">public void switchToUpload​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Upload page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - the mouse has done something</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code> - this page does not exist</dd>
+</dl>
+</li>
+</ul>
+<a id="MapSearch(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MapSearch</h4>
+<pre class="methodSignature">public void MapSearch​(javafx.event.ActionEvent actionEvent)</pre>
+<div class="block">Method that searches for images on a specific place</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/controllers/Search.html b/javadoc/NTNU/IDATT1002/controllers/Search.html
new file mode 100644
index 0000000000000000000000000000000000000000..701a3d37a51fdac3a681a49d8fa11db08d0eb8b5
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/controllers/Search.html
@@ -0,0 +1,770 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>Search</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Search";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.controllers</a></div>
+<h2 title="Class Search" class="title">Class Search</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.controllers.Search</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><code>javafx.fxml.Initializable</code></dd>
+</dl>
+<hr>
+<pre>public class <span class="typeNameLabel">Search</span>
+extends java.lang.Object
+implements javafx.fxml.Initializable</pre>
+<div class="block">Controls the buttons and changeable elements on search.fxml,
+ a page where you can search for images and sort them</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.ScrollPane</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#scrollpane">scrollpane</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.text.Text</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#search_result">search_result</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.ChoiceBox</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#sorted_by_choicebox">sorted_by_choicebox</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_albums">tbar_albums</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_explore">tbar_explore</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_logo">tbar_logo</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_map">tbar_map</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_search">tbar_search</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_searchBtn">tbar_searchBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_upload">tbar_upload</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.layout.VBox</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#vBox">vBox</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">Search</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#initialize(java.net.URL,java.util.ResourceBundle)">initialize</a></span>​(java.net.URL location,
+ java.util.ResourceBundle resources)</code></th>
+<td class="colLast">
+<div class="block">Method that writes the word that is searched for.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>javafx.scene.text.Text</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setText(java.lang.String,int,int,double,java.lang.String,double)">setText</a></span>​(java.lang.String text,
+ int layoutX,
+ int layoutY,
+ double wrappingWidth,
+ java.lang.String fontName,
+ double fontSize)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>javafx.scene.text.Text</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setText(java.lang.String,int,int,java.lang.String,double)">setText</a></span>​(java.lang.String text,
+ int layoutX,
+ int layoutY,
+ java.lang.String fontName,
+ double fontSize)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Albums page</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToExplore(javafx.event.ActionEvent)">switchToExplore</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Explore page</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMain(javafx.scene.input.MouseEvent)">switchToMain</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Main page</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMap(javafx.event.ActionEvent)">switchToMap</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Map page</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToNext(javafx.event.ActionEvent)">switchToNext</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that updates content to next "page"</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToPicture(javafx.scene.input.MouseEvent)">switchToPicture</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast">
+<div class="block">Method for opening the chosen picture.</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToPrevious(javafx.event.ActionEvent)">switchToPrevious</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that updates content to previous "page"</div>
+</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToSearch(javafx.event.ActionEvent)">switchToSearch</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Search page.</div>
+</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToUpload(javafx.event.ActionEvent)">switchToUpload</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Upload page</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="tbar_logo">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_logo</h4>
+<pre>public javafx.scene.image.ImageView tbar_logo</pre>
+</li>
+</ul>
+<a id="tbar_search">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_search</h4>
+<pre>public javafx.scene.control.TextField tbar_search</pre>
+</li>
+</ul>
+<a id="tbar_searchBtn">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_searchBtn</h4>
+<pre>public javafx.scene.control.Button tbar_searchBtn</pre>
+</li>
+</ul>
+<a id="tbar_explore">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_explore</h4>
+<pre>public javafx.scene.control.Button tbar_explore</pre>
+</li>
+</ul>
+<a id="tbar_map">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_map</h4>
+<pre>public javafx.scene.control.Button tbar_map</pre>
+</li>
+</ul>
+<a id="tbar_upload">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_upload</h4>
+<pre>public javafx.scene.control.Button tbar_upload</pre>
+</li>
+</ul>
+<a id="tbar_albums">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_albums</h4>
+<pre>public javafx.scene.control.Button tbar_albums</pre>
+</li>
+</ul>
+<a id="search_result">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>search_result</h4>
+<pre>public javafx.scene.text.Text search_result</pre>
+</li>
+</ul>
+<a id="scrollpane">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>scrollpane</h4>
+<pre>public javafx.scene.control.ScrollPane scrollpane</pre>
+</li>
+</ul>
+<a id="sorted_by_choicebox">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>sorted_by_choicebox</h4>
+<pre>public javafx.scene.control.ChoiceBox sorted_by_choicebox</pre>
+</li>
+</ul>
+<a id="vBox">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>vBox</h4>
+<pre>public javafx.scene.layout.VBox vBox</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Search</h4>
+<pre>public Search()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="initialize(java.net.URL,java.util.ResourceBundle)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>initialize</h4>
+<pre class="methodSignature">public void initialize​(java.net.URL location,
+ java.util.ResourceBundle resources)</pre>
+<div class="block">Method that writes the word that is searched for.
+ Also generates HBoxes with image title, tags...</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>initialize</code> in interface <code>javafx.fxml.Initializable</code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>location</code> - </dd>
+<dd><code>resources</code> - </dd>
+</dl>
+</li>
+</ul>
+<a id="setText(java.lang.String,int,int,double,java.lang.String,double)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setText</h4>
+<pre class="methodSignature">public javafx.scene.text.Text setText​(java.lang.String text,
+ int layoutX,
+ int layoutY,
+ double wrappingWidth,
+ java.lang.String fontName,
+ double fontSize)</pre>
+</li>
+</ul>
+<a id="setText(java.lang.String,int,int,java.lang.String,double)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setText</h4>
+<pre class="methodSignature">public javafx.scene.text.Text setText​(java.lang.String text,
+ int layoutX,
+ int layoutY,
+ java.lang.String fontName,
+ double fontSize)</pre>
+</li>
+</ul>
+<a id="switchToMain(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMain</h4>
+<pre class="methodSignature">public void switchToMain​(javafx.scene.input.MouseEvent mouseEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Main page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>mouseEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToSearch(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToSearch</h4>
+<pre class="methodSignature">public void switchToSearch​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Search page. It reads the value of the search
+ field and if not empty it is passed to dataexchange</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToExplore(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToExplore</h4>
+<pre class="methodSignature">public void switchToExplore​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Explore page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToAlbums(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToAlbums</h4>
+<pre class="methodSignature">public void switchToAlbums​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Albums page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToMap(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMap</h4>
+<pre class="methodSignature">public void switchToMap​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Map page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToUpload(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToUpload</h4>
+<pre class="methodSignature">public void switchToUpload​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Upload page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - the mouse has done something</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code> - this page does not exist</dd>
+</dl>
+</li>
+</ul>
+<a id="switchToPrevious(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToPrevious</h4>
+<pre class="methodSignature">public void switchToPrevious​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that updates content to previous "page"</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToNext(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToNext</h4>
+<pre class="methodSignature">public void switchToNext​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that updates content to next "page"</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToPicture(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>switchToPicture</h4>
+<pre class="methodSignature">public void switchToPicture​(javafx.scene.input.MouseEvent mouseEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method for opening the chosen picture.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>mouseEvent</code> - what is clicked on</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/controllers/SignUp.html b/javadoc/NTNU/IDATT1002/controllers/SignUp.html
new file mode 100644
index 0000000000000000000000000000000000000000..dc7933b9b0b12c9d592838718c5ff1c92de5a806
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/controllers/SignUp.html
@@ -0,0 +1,499 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>SignUp</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="SignUp";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.controllers</a></div>
+<h2 title="Class SignUp" class="title">Class SignUp</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.controllers.SignUp</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">SignUp</span>
+extends java.lang.Object</pre>
+<div class="block">Controls the buttons and changeable elements on signup.fxml,
+ a page where you create a new user for the application</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.DatePicker</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#signup_birthDate">signup_birthDate</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#signup_btn">signup_btn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#signup_email">signup_email</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#signup_firstName">signup_firstName</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.layout.GridPane</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#signup_form">signup_form</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#signup_lastName">signup_lastName</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.PasswordField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#signup_password">signup_password</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#signup_phoneCode">signup_phoneCode</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#signup_phoneNr">signup_phoneNr</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#signup_username">signup_username</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../service/UserService.html" title="class in NTNU.IDATT1002.service">UserService</a></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#userService">userService</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">SignUp</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#signup(javafx.event.ActionEvent)">signup</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Login</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="signup_form">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>signup_form</h4>
+<pre>public javafx.scene.layout.GridPane signup_form</pre>
+</li>
+</ul>
+<a id="signup_firstName">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>signup_firstName</h4>
+<pre>public javafx.scene.control.TextField signup_firstName</pre>
+</li>
+</ul>
+<a id="signup_lastName">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>signup_lastName</h4>
+<pre>public javafx.scene.control.TextField signup_lastName</pre>
+</li>
+</ul>
+<a id="signup_username">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>signup_username</h4>
+<pre>public javafx.scene.control.TextField signup_username</pre>
+</li>
+</ul>
+<a id="signup_email">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>signup_email</h4>
+<pre>public javafx.scene.control.TextField signup_email</pre>
+</li>
+</ul>
+<a id="signup_password">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>signup_password</h4>
+<pre>public javafx.scene.control.PasswordField signup_password</pre>
+</li>
+</ul>
+<a id="signup_phoneCode">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>signup_phoneCode</h4>
+<pre>public javafx.scene.control.TextField signup_phoneCode</pre>
+</li>
+</ul>
+<a id="signup_phoneNr">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>signup_phoneNr</h4>
+<pre>public javafx.scene.control.TextField signup_phoneNr</pre>
+</li>
+</ul>
+<a id="signup_birthDate">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>signup_birthDate</h4>
+<pre>public javafx.scene.control.DatePicker signup_birthDate</pre>
+</li>
+</ul>
+<a id="userService">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>userService</h4>
+<pre>public <a href="../service/UserService.html" title="class in NTNU.IDATT1002.service">UserService</a> userService</pre>
+</li>
+</ul>
+<a id="signup_btn">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>signup_btn</h4>
+<pre>public javafx.scene.control.Button signup_btn</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>SignUp</h4>
+<pre>public SignUp()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="signup(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>signup</h4>
+<pre class="methodSignature">public void signup​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Login</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/controllers/SignUpController.html b/javadoc/NTNU/IDATT1002/controllers/SignUpController.html
index 1bbc4c12def22b60d4544f3dae7ae29e51f9df94..62b0c419bb72d987bf12c69ded9c650e2b0a1ff2 100644
--- a/javadoc/NTNU/IDATT1002/controllers/SignUpController.html
+++ b/javadoc/NTNU/IDATT1002/controllers/SignUpController.html
@@ -124,7 +124,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
-<li>NTNU.IDATT1002.controllers.SignUpController</li>
+<li>NTNU.IDATT1002.controllers.SignUp</li>
</ul>
</li>
</ul>
diff --git a/javadoc/NTNU/IDATT1002/controllers/Upload.html b/javadoc/NTNU/IDATT1002/controllers/Upload.html
new file mode 100644
index 0000000000000000000000000000000000000000..a372d86cdb1cf3041cb1d3c0191ff5cc73aaf163
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/controllers/Upload.html
@@ -0,0 +1,686 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>Upload</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Upload";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.controllers</a></div>
+<h2 title="Class Upload" class="title">Class Upload</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.controllers.Upload</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">Upload</span>
+extends java.lang.Object</pre>
+<div class="block">Controls the buttons and changeable elements on upload.fxml,
+ a page where you select images to upload</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.layout.Pane</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#drag_drop">drag_drop</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_albums">tbar_albums</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_explore">tbar_explore</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_logo">tbar_logo</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_map">tbar_map</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_search">tbar_search</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_searchBtn">tbar_searchBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_upload">tbar_upload</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#uploadBtn">uploadBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">Upload</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#acceptDrop(javafx.scene.input.DragEvent)">acceptDrop</a></span>​(javafx.scene.input.DragEvent event)</code></th>
+<td class="colLast">
+<div class="block">Method that decides if something can be dropped
+ The method is called whenever something is hoovered over the drag-drop pane</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#chooseFile()">chooseFile</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Method that opens file browser with an image filter
+ The user will choose what files to upload</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#droppedFiles(javafx.scene.input.DragEvent)">droppedFiles</a></span>​(javafx.scene.input.DragEvent event)</code></th>
+<td class="colLast">
+<div class="block">Method that stores the dropped files</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getExtension(java.lang.String)">getExtension</a></span>​(java.lang.String fileName)</code></th>
+<td class="colLast">
+<div class="block">Method that finds the extension of a file</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Albums page</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToExplore(javafx.event.ActionEvent)">switchToExplore</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Explore page</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMain(javafx.scene.input.MouseEvent)">switchToMain</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Main page</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMap(javafx.event.ActionEvent)">switchToMap</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Map page</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToSearch(javafx.event.ActionEvent)">switchToSearch</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Search page.</div>
+</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToUpload(javafx.event.ActionEvent)">switchToUpload</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Upload page</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="tbar_logo">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_logo</h4>
+<pre>public javafx.scene.image.ImageView tbar_logo</pre>
+</li>
+</ul>
+<a id="tbar_search">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_search</h4>
+<pre>public javafx.scene.control.TextField tbar_search</pre>
+</li>
+</ul>
+<a id="tbar_searchBtn">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_searchBtn</h4>
+<pre>public javafx.scene.control.Button tbar_searchBtn</pre>
+</li>
+</ul>
+<a id="tbar_explore">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_explore</h4>
+<pre>public javafx.scene.control.Button tbar_explore</pre>
+</li>
+</ul>
+<a id="tbar_map">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_map</h4>
+<pre>public javafx.scene.control.Button tbar_map</pre>
+</li>
+</ul>
+<a id="tbar_upload">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_upload</h4>
+<pre>public javafx.scene.control.Button tbar_upload</pre>
+</li>
+</ul>
+<a id="uploadBtn">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>uploadBtn</h4>
+<pre>public javafx.scene.control.Button uploadBtn</pre>
+</li>
+</ul>
+<a id="drag_drop">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>drag_drop</h4>
+<pre>public javafx.scene.layout.Pane drag_drop</pre>
+</li>
+</ul>
+<a id="tbar_albums">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>tbar_albums</h4>
+<pre>public javafx.scene.control.Button tbar_albums</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Upload</h4>
+<pre>public Upload()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="switchToMain(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMain</h4>
+<pre class="methodSignature">public void switchToMain​(javafx.scene.input.MouseEvent mouseEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Main page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>mouseEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToSearch(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToSearch</h4>
+<pre class="methodSignature">public void switchToSearch​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Search page. It reads the value of the search
+ field and if not empty it is passed to dataexchange</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToExplore(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToExplore</h4>
+<pre class="methodSignature">public void switchToExplore​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Explore page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToAlbums(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToAlbums</h4>
+<pre class="methodSignature">public void switchToAlbums​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Albums page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToMap(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMap</h4>
+<pre class="methodSignature">public void switchToMap​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Map page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToUpload(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToUpload</h4>
+<pre class="methodSignature">public void switchToUpload​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Upload page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - the mouse has done something</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code> - this page does not exist</dd>
+</dl>
+</li>
+</ul>
+<a id="chooseFile()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>chooseFile</h4>
+<pre class="methodSignature">public void chooseFile()
+ throws java.io.IOException</pre>
+<div class="block">Method that opens file browser with an image filter
+ The user will choose what files to upload</div>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="getExtension(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getExtension</h4>
+<pre class="methodSignature">public java.lang.String getExtension​(java.lang.String fileName)</pre>
+<div class="block">Method that finds the extension of a file</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>fileName</code> - the name of the file (img.jpg, img2.png ect.)</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>file extension (jpg, png ect.)</dd>
+</dl>
+</li>
+</ul>
+<a id="acceptDrop(javafx.scene.input.DragEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>acceptDrop</h4>
+<pre class="methodSignature">public void acceptDrop​(javafx.scene.input.DragEvent event)</pre>
+<div class="block">Method that decides if something can be dropped
+ The method is called whenever something is hoovered over the drag-drop pane</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>event</code> - something is dragged over the container</dd>
+</dl>
+</li>
+</ul>
+<a id="droppedFiles(javafx.scene.input.DragEvent)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>droppedFiles</h4>
+<pre class="methodSignature">public void droppedFiles​(javafx.scene.input.DragEvent event)
+ throws java.io.IOException</pre>
+<div class="block">Method that stores the dropped files</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>event</code> - something is dropped into the container</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/controllers/UploadedMultiple.html b/javadoc/NTNU/IDATT1002/controllers/UploadedMultiple.html
new file mode 100644
index 0000000000000000000000000000000000000000..08eb475d410aded6377fa5a4dd056f10f19b3a5a
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/controllers/UploadedMultiple.html
@@ -0,0 +1,828 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>UploadedMultiple</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="UploadedMultiple";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.controllers</a></div>
+<h2 title="Class UploadedMultiple" class="title">Class UploadedMultiple</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.controllers.UploadedMultiple</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">UploadedMultiple</span>
+extends java.lang.Object</pre>
+<div class="block">Controls the buttons and changeable elements on upload_multiple.fxml,
+ a page where you add descriptions to your selected images</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#acceptBtn">acceptBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextArea</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_desc">photo_desc</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.TextArea</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_desc2">photo_desc2</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextArea</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_desc3">photo_desc3</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.TextArea</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_desc4">photo_desc4</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_image">photo_image</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_image2">photo_image2</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_image3">photo_image3</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_image4">photo_image4</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_tag">photo_tag</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_tag2">photo_tag2</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_tag3">photo_tag3</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_tag4">photo_tag4</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_title">photo_title</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_title2">photo_title2</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_title3">photo_title3</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_title4">photo_title4</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_albums">tbar_albums</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_explore">tbar_explore</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_logo">tbar_logo</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_map">tbar_map</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_search">tbar_search</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_searchBtn">tbar_searchBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_upload">tbar_upload</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">UploadedMultiple</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Albums page</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToExplore(javafx.event.ActionEvent)">switchToExplore</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Explore page</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMain(javafx.scene.input.MouseEvent)">switchToMain</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Main page</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMap(javafx.event.ActionEvent)">switchToMap</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Map page</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToSearch(javafx.event.ActionEvent)">switchToSearch</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Search page.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToUpload(javafx.event.ActionEvent)">switchToUpload</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Upload page</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#uploadMultiple(javafx.event.ActionEvent)">uploadMultiple</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method for uploading several images to database with title, tags and description
+ Image itself is not stored but URL is</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="tbar_logo">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_logo</h4>
+<pre>public javafx.scene.image.ImageView tbar_logo</pre>
+</li>
+</ul>
+<a id="tbar_search">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_search</h4>
+<pre>public javafx.scene.control.TextField tbar_search</pre>
+</li>
+</ul>
+<a id="tbar_searchBtn">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_searchBtn</h4>
+<pre>public javafx.scene.control.Button tbar_searchBtn</pre>
+</li>
+</ul>
+<a id="tbar_explore">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_explore</h4>
+<pre>public javafx.scene.control.Button tbar_explore</pre>
+</li>
+</ul>
+<a id="tbar_map">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_map</h4>
+<pre>public javafx.scene.control.Button tbar_map</pre>
+</li>
+</ul>
+<a id="tbar_upload">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_upload</h4>
+<pre>public javafx.scene.control.Button tbar_upload</pre>
+</li>
+</ul>
+<a id="photo_title">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_title</h4>
+<pre>public javafx.scene.control.TextField photo_title</pre>
+</li>
+</ul>
+<a id="photo_tag">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_tag</h4>
+<pre>public javafx.scene.control.TextField photo_tag</pre>
+</li>
+</ul>
+<a id="photo_desc">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_desc</h4>
+<pre>public javafx.scene.control.TextArea photo_desc</pre>
+</li>
+</ul>
+<a id="photo_image">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_image</h4>
+<pre>public javafx.scene.image.ImageView photo_image</pre>
+</li>
+</ul>
+<a id="photo_title2">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_title2</h4>
+<pre>public javafx.scene.control.TextField photo_title2</pre>
+</li>
+</ul>
+<a id="photo_tag2">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_tag2</h4>
+<pre>public javafx.scene.control.TextField photo_tag2</pre>
+</li>
+</ul>
+<a id="photo_desc2">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_desc2</h4>
+<pre>public javafx.scene.control.TextArea photo_desc2</pre>
+</li>
+</ul>
+<a id="photo_image2">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_image2</h4>
+<pre>public javafx.scene.image.ImageView photo_image2</pre>
+</li>
+</ul>
+<a id="photo_title3">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_title3</h4>
+<pre>public javafx.scene.control.TextField photo_title3</pre>
+</li>
+</ul>
+<a id="photo_tag3">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_tag3</h4>
+<pre>public javafx.scene.control.TextField photo_tag3</pre>
+</li>
+</ul>
+<a id="photo_desc3">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_desc3</h4>
+<pre>public javafx.scene.control.TextArea photo_desc3</pre>
+</li>
+</ul>
+<a id="photo_image3">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_image3</h4>
+<pre>public javafx.scene.image.ImageView photo_image3</pre>
+</li>
+</ul>
+<a id="photo_title4">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_title4</h4>
+<pre>public javafx.scene.control.TextField photo_title4</pre>
+</li>
+</ul>
+<a id="photo_tag4">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_tag4</h4>
+<pre>public javafx.scene.control.TextField photo_tag4</pre>
+</li>
+</ul>
+<a id="photo_desc4">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_desc4</h4>
+<pre>public javafx.scene.control.TextArea photo_desc4</pre>
+</li>
+</ul>
+<a id="photo_image4">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_image4</h4>
+<pre>public javafx.scene.image.ImageView photo_image4</pre>
+</li>
+</ul>
+<a id="acceptBtn">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>acceptBtn</h4>
+<pre>public javafx.scene.control.Button acceptBtn</pre>
+</li>
+</ul>
+<a id="tbar_albums">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>tbar_albums</h4>
+<pre>public javafx.scene.control.Button tbar_albums</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>UploadedMultiple</h4>
+<pre>public UploadedMultiple()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="switchToMain(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMain</h4>
+<pre class="methodSignature">public void switchToMain​(javafx.scene.input.MouseEvent mouseEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Main page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>mouseEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToSearch(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToSearch</h4>
+<pre class="methodSignature">public void switchToSearch​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Search page. It reads the value of the search
+ field and if not empty it is passed to dataexchange</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToExplore(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToExplore</h4>
+<pre class="methodSignature">public void switchToExplore​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Explore page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToAlbums(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToAlbums</h4>
+<pre class="methodSignature">public void switchToAlbums​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Albums page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToMap(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMap</h4>
+<pre class="methodSignature">public void switchToMap​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Map page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToUpload(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToUpload</h4>
+<pre class="methodSignature">public void switchToUpload​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Upload page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="uploadMultiple(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>uploadMultiple</h4>
+<pre class="methodSignature">public void uploadMultiple​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method for uploading several images to database with title, tags and description
+ Image itself is not stored but URL is</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/controllers/UploadedSingle.html b/javadoc/NTNU/IDATT1002/controllers/UploadedSingle.html
new file mode 100644
index 0000000000000000000000000000000000000000..38271fad85cf3d8de1652cda59f04a78bab640ea
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/controllers/UploadedSingle.html
@@ -0,0 +1,716 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>UploadedSingle</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="UploadedSingle";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.controllers</a></div>
+<h2 title="Class UploadedSingle" class="title">Class UploadedSingle</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.controllers.UploadedSingle</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><code>javafx.fxml.Initializable</code></dd>
+</dl>
+<hr>
+<pre>public class <span class="typeNameLabel">UploadedSingle</span>
+extends java.lang.Object
+implements javafx.fxml.Initializable</pre>
+<div class="block">Controls the buttons and changeable elements on upload_single.fxml,
+ a page where you add descriptions to your selected image</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#acceptBtn">acceptBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextArea</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_desc">photo_desc</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_image">photo_image</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_tag">photo_tag</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#photo_title">photo_title</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_albums">tbar_albums</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_explore">tbar_explore</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_logo">tbar_logo</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_map">tbar_map</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_search">tbar_search</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_searchBtn">tbar_searchBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_upload">tbar_upload</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">UploadedSingle</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#initialize(java.net.URL,java.util.ResourceBundle)">initialize</a></span>​(java.net.URL location,
+ java.util.ResourceBundle resources)</code></th>
+<td class="colLast">
+<div class="block">Method that runs when the controller is loaded
+ Sets the image url on the page to be the uploaded images url</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes stage to Albums page</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToExplore(javafx.event.ActionEvent)">switchToExplore</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes stage to Explore page</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMain(javafx.scene.input.MouseEvent)">switchToMain</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes stage to Main page</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMap(javafx.event.ActionEvent)">switchToMap</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes stage to Map page</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToSearch(javafx.event.ActionEvent)">switchToSearch</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes stage to Search page.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToUpload(javafx.event.ActionEvent)">switchToUpload</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes stage to Upload page</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>java.util.List<java.lang.String></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tagStringSplit(javafx.scene.control.TextField)">tagStringSplit</a></span>​(javafx.scene.control.TextField photo_tag)</code></th>
+<td class="colLast">
+<div class="block">Method for splitting the tag textField into tags in a list</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#uploadSingle(javafx.event.ActionEvent)">uploadSingle</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method for uploading image to database with tags
+ Image itself is not stored but URL is</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="tbar_logo">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_logo</h4>
+<pre>public javafx.scene.image.ImageView tbar_logo</pre>
+</li>
+</ul>
+<a id="tbar_search">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_search</h4>
+<pre>public javafx.scene.control.TextField tbar_search</pre>
+</li>
+</ul>
+<a id="tbar_searchBtn">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_searchBtn</h4>
+<pre>public javafx.scene.control.Button tbar_searchBtn</pre>
+</li>
+</ul>
+<a id="tbar_explore">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_explore</h4>
+<pre>public javafx.scene.control.Button tbar_explore</pre>
+</li>
+</ul>
+<a id="tbar_map">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_map</h4>
+<pre>public javafx.scene.control.Button tbar_map</pre>
+</li>
+</ul>
+<a id="tbar_upload">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_upload</h4>
+<pre>public javafx.scene.control.Button tbar_upload</pre>
+</li>
+</ul>
+<a id="photo_title">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_title</h4>
+<pre>public javafx.scene.control.TextField photo_title</pre>
+</li>
+</ul>
+<a id="photo_tag">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_tag</h4>
+<pre>public javafx.scene.control.TextField photo_tag</pre>
+</li>
+</ul>
+<a id="photo_desc">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_desc</h4>
+<pre>public javafx.scene.control.TextArea photo_desc</pre>
+</li>
+</ul>
+<a id="photo_image">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>photo_image</h4>
+<pre>public javafx.scene.image.ImageView photo_image</pre>
+</li>
+</ul>
+<a id="acceptBtn">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>acceptBtn</h4>
+<pre>public javafx.scene.control.Button acceptBtn</pre>
+</li>
+</ul>
+<a id="tbar_albums">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>tbar_albums</h4>
+<pre>public javafx.scene.control.Button tbar_albums</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>UploadedSingle</h4>
+<pre>public UploadedSingle()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="initialize(java.net.URL,java.util.ResourceBundle)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>initialize</h4>
+<pre class="methodSignature">public void initialize​(java.net.URL location,
+ java.util.ResourceBundle resources)</pre>
+<div class="block">Method that runs when the controller is loaded
+ Sets the image url on the page to be the uploaded images url</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>initialize</code> in interface <code>javafx.fxml.Initializable</code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>location</code> - </dd>
+<dd><code>resources</code> - </dd>
+</dl>
+</li>
+</ul>
+<a id="switchToMain(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMain</h4>
+<pre class="methodSignature">public void switchToMain​(javafx.scene.input.MouseEvent mouseEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes stage to Main page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>mouseEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToSearch(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToSearch</h4>
+<pre class="methodSignature">public void switchToSearch​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes stage to Search page. It reads the value of the search
+ field and if not empty it is passed to dataexchange</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToExplore(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToExplore</h4>
+<pre class="methodSignature">public void switchToExplore​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes stage to Explore page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToAlbums(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToAlbums</h4>
+<pre class="methodSignature">public void switchToAlbums​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes stage to Albums page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToMap(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMap</h4>
+<pre class="methodSignature">public void switchToMap​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes stage to Map page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToUpload(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToUpload</h4>
+<pre class="methodSignature">public void switchToUpload​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes stage to Upload page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="uploadSingle(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>uploadSingle</h4>
+<pre class="methodSignature">public void uploadSingle​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method for uploading image to database with tags
+ Image itself is not stored but URL is</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="tagStringSplit(javafx.scene.control.TextField)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>tagStringSplit</h4>
+<pre class="methodSignature">public java.util.List<java.lang.String> tagStringSplit​(javafx.scene.control.TextField photo_tag)</pre>
+<div class="block">Method for splitting the tag textField into tags in a list</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>photo_tag</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>list of string</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/controllers/ViewAlbum.html b/javadoc/NTNU/IDATT1002/controllers/ViewAlbum.html
new file mode 100644
index 0000000000000000000000000000000000000000..6a7d66ebc2ca9336177685b5623b3f4bca56d592
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/controllers/ViewAlbum.html
@@ -0,0 +1,994 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>ViewAlbum</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="ViewAlbum";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.controllers</a></div>
+<h2 title="Class ViewAlbum" class="title">Class ViewAlbum</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.controllers.ViewAlbum</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><code>javafx.fxml.Initializable</code></dd>
+</dl>
+<hr>
+<pre>public class <span class="typeNameLabel">ViewAlbum</span>
+extends java.lang.Object
+implements javafx.fxml.Initializable</pre>
+<div class="block">Controls the buttons and changeable elements on view_album.fxml,
+ a page where get a more detailed view of an album</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.text.Text</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#album_authorField">album_authorField</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.text.Text</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#album_descField">album_descField</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.layout.GridPane</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#album_fields_grid_pane">album_fields_grid_pane</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.text.Text</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#album_tagsField">album_tagsField</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.text.Text</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#album_titleField">album_titleField</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#create_album_document">create_album_document</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#main_picture">main_picture</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.layout.Pane</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#metadata_pane">metadata_pane</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.text.Text</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#picture_tagsField">picture_tagsField</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.text.Text</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#picture_title_field">picture_title_field</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#scroll_button_next">scroll_button_next</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#scroll_button_previous">scroll_button_previous</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#scroll_picture1">scroll_picture1</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#scroll_picture2">scroll_picture2</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#scroll_picture3">scroll_picture3</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#scroll_picture4">scroll_picture4</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#scroll_picture5">scroll_picture5</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#scroll_picture6">scroll_picture6</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_albums">tbar_albums</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_explore">tbar_explore</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_logo">tbar_logo</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_map">tbar_map</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_search">tbar_search</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_searchBtn">tbar_searchBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_upload">tbar_upload</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">ViewAlbum</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#changeMainPicture1(javafx.scene.input.MouseEvent)">changeMainPicture1</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#changeMainPicture2(javafx.scene.input.MouseEvent)">changeMainPicture2</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#changeMainPicture3(javafx.scene.input.MouseEvent)">changeMainPicture3</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#changeMainPicture4(javafx.scene.input.MouseEvent)">changeMainPicture4</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#changeMainPicture5(javafx.scene.input.MouseEvent)">changeMainPicture5</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#changeMainPicture6(javafx.scene.input.MouseEvent)">changeMainPicture6</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createDocument(javafx.event.ActionEvent)">createDocument</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Retrieve and display album document.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#initialize(java.net.URL,java.util.ResourceBundle)">initialize</a></span>​(java.net.URL url,
+ java.util.ResourceBundle resourceBundle)</code></th>
+<td class="colLast">
+<div class="block">Initialize view with real album data.</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#loadNextScrollbarView(javafx.event.ActionEvent)">loadNextScrollbarView</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#loadPreviousScrollbarView(javafx.event.ActionEvent)">loadPreviousScrollbarView</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#openPopUpPicture(javafx.scene.input.MouseEvent)">openPopUpPicture</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Albums page</div>
+</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToExplore(javafx.event.ActionEvent)">switchToExplore</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Explore page</div>
+</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMain(javafx.scene.input.MouseEvent)">switchToMain</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Main page</div>
+</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMap(javafx.event.ActionEvent)">switchToMap</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Map page</div>
+</td>
+</tr>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToSearch(javafx.event.ActionEvent)">switchToSearch</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Search page.</div>
+</td>
+</tr>
+<tr id="i16" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToUpload(javafx.event.ActionEvent)">switchToUpload</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Upload page</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="tbar_search">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_search</h4>
+<pre>public javafx.scene.control.TextField tbar_search</pre>
+</li>
+</ul>
+<a id="tbar_logo">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_logo</h4>
+<pre>public javafx.scene.image.ImageView tbar_logo</pre>
+</li>
+</ul>
+<a id="tbar_explore">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_explore</h4>
+<pre>public javafx.scene.control.Button tbar_explore</pre>
+</li>
+</ul>
+<a id="tbar_map">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_map</h4>
+<pre>public javafx.scene.control.Button tbar_map</pre>
+</li>
+</ul>
+<a id="tbar_upload">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_upload</h4>
+<pre>public javafx.scene.control.Button tbar_upload</pre>
+</li>
+</ul>
+<a id="tbar_searchBtn">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_searchBtn</h4>
+<pre>public javafx.scene.control.Button tbar_searchBtn</pre>
+</li>
+</ul>
+<a id="tbar_albums">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_albums</h4>
+<pre>public javafx.scene.control.Button tbar_albums</pre>
+</li>
+</ul>
+<a id="album_titleField">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>album_titleField</h4>
+<pre>public javafx.scene.text.Text album_titleField</pre>
+</li>
+</ul>
+<a id="album_authorField">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>album_authorField</h4>
+<pre>public javafx.scene.text.Text album_authorField</pre>
+</li>
+</ul>
+<a id="album_tagsField">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>album_tagsField</h4>
+<pre>public javafx.scene.text.Text album_tagsField</pre>
+</li>
+</ul>
+<a id="album_descField">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>album_descField</h4>
+<pre>public javafx.scene.text.Text album_descField</pre>
+</li>
+</ul>
+<a id="metadata_pane">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>metadata_pane</h4>
+<pre>public javafx.scene.layout.Pane metadata_pane</pre>
+</li>
+</ul>
+<a id="create_album_document">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>create_album_document</h4>
+<pre>public javafx.scene.control.Button create_album_document</pre>
+</li>
+</ul>
+<a id="main_picture">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>main_picture</h4>
+<pre>public javafx.scene.image.ImageView main_picture</pre>
+</li>
+</ul>
+<a id="scroll_picture6">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>scroll_picture6</h4>
+<pre>public javafx.scene.image.ImageView scroll_picture6</pre>
+</li>
+</ul>
+<a id="scroll_picture5">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>scroll_picture5</h4>
+<pre>public javafx.scene.image.ImageView scroll_picture5</pre>
+</li>
+</ul>
+<a id="scroll_picture4">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>scroll_picture4</h4>
+<pre>public javafx.scene.image.ImageView scroll_picture4</pre>
+</li>
+</ul>
+<a id="scroll_picture3">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>scroll_picture3</h4>
+<pre>public javafx.scene.image.ImageView scroll_picture3</pre>
+</li>
+</ul>
+<a id="scroll_picture2">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>scroll_picture2</h4>
+<pre>public javafx.scene.image.ImageView scroll_picture2</pre>
+</li>
+</ul>
+<a id="scroll_picture1">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>scroll_picture1</h4>
+<pre>public javafx.scene.image.ImageView scroll_picture1</pre>
+</li>
+</ul>
+<a id="scroll_button_next">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>scroll_button_next</h4>
+<pre>public javafx.scene.control.Button scroll_button_next</pre>
+</li>
+</ul>
+<a id="scroll_button_previous">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>scroll_button_previous</h4>
+<pre>public javafx.scene.control.Button scroll_button_previous</pre>
+</li>
+</ul>
+<a id="picture_title_field">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>picture_title_field</h4>
+<pre>public javafx.scene.text.Text picture_title_field</pre>
+</li>
+</ul>
+<a id="picture_tagsField">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>picture_tagsField</h4>
+<pre>public javafx.scene.text.Text picture_tagsField</pre>
+</li>
+</ul>
+<a id="album_fields_grid_pane">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>album_fields_grid_pane</h4>
+<pre>public javafx.scene.layout.GridPane album_fields_grid_pane</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ViewAlbum</h4>
+<pre>public ViewAlbum()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="initialize(java.net.URL,java.util.ResourceBundle)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>initialize</h4>
+<pre class="methodSignature">public void initialize​(java.net.URL url,
+ java.util.ResourceBundle resourceBundle)</pre>
+<div class="block">Initialize view with real album data.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>initialize</code> in interface <code>javafx.fxml.Initializable</code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>url</code> - </dd>
+<dd><code>resourceBundle</code> - </dd>
+</dl>
+</li>
+</ul>
+<a id="switchToMain(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMain</h4>
+<pre class="methodSignature">public void switchToMain​(javafx.scene.input.MouseEvent mouseEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Main page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>mouseEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToSearch(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToSearch</h4>
+<pre class="methodSignature">public void switchToSearch​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Search page. It reads the value of the search
+ field and if not empty it is passed to dataexchange</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToExplore(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToExplore</h4>
+<pre class="methodSignature">public void switchToExplore​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Explore page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToAlbums(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToAlbums</h4>
+<pre class="methodSignature">public void switchToAlbums​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Albums page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToMap(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMap</h4>
+<pre class="methodSignature">public void switchToMap​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Map page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToUpload(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToUpload</h4>
+<pre class="methodSignature">public void switchToUpload​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Upload page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - the mouse has done something</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code> - this page does not exist</dd>
+</dl>
+</li>
+</ul>
+<a id="openPopUpPicture(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>openPopUpPicture</h4>
+<pre class="methodSignature">public void openPopUpPicture​(javafx.scene.input.MouseEvent mouseEvent)</pre>
+</li>
+</ul>
+<a id="changeMainPicture1(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>changeMainPicture1</h4>
+<pre class="methodSignature">public void changeMainPicture1​(javafx.scene.input.MouseEvent mouseEvent)</pre>
+</li>
+</ul>
+<a id="changeMainPicture2(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>changeMainPicture2</h4>
+<pre class="methodSignature">public void changeMainPicture2​(javafx.scene.input.MouseEvent mouseEvent)</pre>
+</li>
+</ul>
+<a id="changeMainPicture3(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>changeMainPicture3</h4>
+<pre class="methodSignature">public void changeMainPicture3​(javafx.scene.input.MouseEvent mouseEvent)</pre>
+</li>
+</ul>
+<a id="changeMainPicture4(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>changeMainPicture4</h4>
+<pre class="methodSignature">public void changeMainPicture4​(javafx.scene.input.MouseEvent mouseEvent)</pre>
+</li>
+</ul>
+<a id="changeMainPicture5(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>changeMainPicture5</h4>
+<pre class="methodSignature">public void changeMainPicture5​(javafx.scene.input.MouseEvent mouseEvent)</pre>
+</li>
+</ul>
+<a id="changeMainPicture6(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>changeMainPicture6</h4>
+<pre class="methodSignature">public void changeMainPicture6​(javafx.scene.input.MouseEvent mouseEvent)</pre>
+</li>
+</ul>
+<a id="loadPreviousScrollbarView(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>loadPreviousScrollbarView</h4>
+<pre class="methodSignature">public void loadPreviousScrollbarView​(javafx.event.ActionEvent actionEvent)</pre>
+</li>
+</ul>
+<a id="loadNextScrollbarView(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>loadNextScrollbarView</h4>
+<pre class="methodSignature">public void loadNextScrollbarView​(javafx.event.ActionEvent actionEvent)</pre>
+</li>
+</ul>
+<a id="createDocument(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>createDocument</h4>
+<pre class="methodSignature">public void createDocument​(javafx.event.ActionEvent actionEvent)</pre>
+<div class="block">Retrieve and display album document.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/controllers/ViewPicture.html b/javadoc/NTNU/IDATT1002/controllers/ViewPicture.html
new file mode 100644
index 0000000000000000000000000000000000000000..de887b65f8cdb6f6d53ddc2817ed8a297d35ef72
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/controllers/ViewPicture.html
@@ -0,0 +1,680 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>ViewPicture</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="ViewPicture";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.controllers</a></div>
+<h2 title="Class ViewPicture" class="title">Class ViewPicture</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.controllers.ViewPicture</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><code>javafx.fxml.Initializable</code></dd>
+</dl>
+<hr>
+<pre>public class <span class="typeNameLabel">ViewPicture</span>
+extends java.lang.Object
+implements javafx.fxml.Initializable</pre>
+<div class="block">Controls the buttons and changeable elements on view_.fxml,
+ a page where get a more detailed view of a picture</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.layout.Pane</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#metadata_pane">metadata_pane</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#picture">picture</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.text.Text</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#picture_descField">picture_descField</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.text.Text</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#picture_tagsField">picture_tagsField</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.text.Text</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#picture_title_field">picture_title_field</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_albums">tbar_albums</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_explore">tbar_explore</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.image.ImageView</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_logo">tbar_logo</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_map">tbar_map</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.TextField</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_search">tbar_search</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_searchBtn">tbar_searchBtn</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>javafx.scene.control.Button</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tbar_upload">tbar_upload</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">ViewPicture</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#initialize(java.net.URL,java.util.ResourceBundle)">initialize</a></span>​(java.net.URL url,
+ java.util.ResourceBundle resourceBundle)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#openPopUpPicture(javafx.scene.input.MouseEvent)">openPopUpPicture</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that opens large version of image in popup</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Albums page</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToExplore(javafx.event.ActionEvent)">switchToExplore</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Explore page</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMain(javafx.scene.input.MouseEvent)">switchToMain</a></span>​(javafx.scene.input.MouseEvent mouseEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Main page</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToMap(javafx.event.ActionEvent)">switchToMap</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Map page</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToSearch(javafx.event.ActionEvent)">switchToSearch</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Search page.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#switchToUpload(javafx.event.ActionEvent)">switchToUpload</a></span>​(javafx.event.ActionEvent actionEvent)</code></th>
+<td class="colLast">
+<div class="block">Method that changes scene to Upload page</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="tbar_logo">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_logo</h4>
+<pre>public javafx.scene.image.ImageView tbar_logo</pre>
+</li>
+</ul>
+<a id="tbar_search">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_search</h4>
+<pre>public javafx.scene.control.TextField tbar_search</pre>
+</li>
+</ul>
+<a id="tbar_explore">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_explore</h4>
+<pre>public javafx.scene.control.Button tbar_explore</pre>
+</li>
+</ul>
+<a id="tbar_map">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_map</h4>
+<pre>public javafx.scene.control.Button tbar_map</pre>
+</li>
+</ul>
+<a id="tbar_upload">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_upload</h4>
+<pre>public javafx.scene.control.Button tbar_upload</pre>
+</li>
+</ul>
+<a id="picture">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>picture</h4>
+<pre>public javafx.scene.image.ImageView picture</pre>
+</li>
+</ul>
+<a id="picture_tagsField">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>picture_tagsField</h4>
+<pre>public javafx.scene.text.Text picture_tagsField</pre>
+</li>
+</ul>
+<a id="picture_title_field">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>picture_title_field</h4>
+<pre>public javafx.scene.text.Text picture_title_field</pre>
+</li>
+</ul>
+<a id="picture_descField">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>picture_descField</h4>
+<pre>public javafx.scene.text.Text picture_descField</pre>
+</li>
+</ul>
+<a id="metadata_pane">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>metadata_pane</h4>
+<pre>public javafx.scene.layout.Pane metadata_pane</pre>
+</li>
+</ul>
+<a id="tbar_searchBtn">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tbar_searchBtn</h4>
+<pre>public javafx.scene.control.Button tbar_searchBtn</pre>
+</li>
+</ul>
+<a id="tbar_albums">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>tbar_albums</h4>
+<pre>public javafx.scene.control.Button tbar_albums</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ViewPicture</h4>
+<pre>public ViewPicture()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="initialize(java.net.URL,java.util.ResourceBundle)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>initialize</h4>
+<pre class="methodSignature">public void initialize​(java.net.URL url,
+ java.util.ResourceBundle resourceBundle)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code>initialize</code> in interface <code>javafx.fxml.Initializable</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToMain(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMain</h4>
+<pre class="methodSignature">public void switchToMain​(javafx.scene.input.MouseEvent mouseEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Main page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>mouseEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToSearch(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToSearch</h4>
+<pre class="methodSignature">public void switchToSearch​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Search page. It reads the value of the search
+ field and if not empty it is passed to dataexchange</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToExplore(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToExplore</h4>
+<pre class="methodSignature">public void switchToExplore​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Explore page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToAlbums(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToAlbums</h4>
+<pre class="methodSignature">public void switchToAlbums​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Albums page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToMap(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToMap</h4>
+<pre class="methodSignature">public void switchToMap​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Map page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - </dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="switchToUpload(javafx.event.ActionEvent)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>switchToUpload</h4>
+<pre class="methodSignature">public void switchToUpload​(javafx.event.ActionEvent actionEvent)
+ throws java.io.IOException</pre>
+<div class="block">Method that changes scene to Upload page</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>actionEvent</code> - the mouse has done something</dd>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>java.io.IOException</code> - this page does not exist</dd>
+</dl>
+</li>
+</ul>
+<a id="openPopUpPicture(javafx.scene.input.MouseEvent)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>openPopUpPicture</h4>
+<pre class="methodSignature">public void openPopUpPicture​(javafx.scene.input.MouseEvent mouseEvent)</pre>
+<div class="block">Method that opens large version of image in popup</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>mouseEvent</code> - </dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/controllers/package-summary.html b/javadoc/NTNU/IDATT1002/controllers/package-summary.html
index 5b504e20a23ecd3e615dcb769676c955aa10c65f..a068aa03e0ebb973943a726f69eb8e3f81ba462d 100644
--- a/javadoc/NTNU/IDATT1002/controllers/package-summary.html
+++ b/javadoc/NTNU/IDATT1002/controllers/package-summary.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>NTNU.IDATT1002.controllers</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
@@ -107,20 +107,102 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</tr>
<tbody>
<tr class="altColor">
-<th class="colFirst" scope="row"><a href="ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></th>
-<td class="colLast"> </td>
+<th class="colFirst" scope="row"><a href="CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></th>
+<td class="colLast">
+<div class="block">Controls the buttons and changeable elements on create_album.fxml,
+ a page where you create albums</div>
+</td>
</tr>
<tr class="rowColor">
-<th class="colFirst" scope="row"><a href="LoggedInController.html" title="class in NTNU.IDATT1002.controllers">LoggedInController</a></th>
-<td class="colLast"> </td>
+<th class="colFirst" scope="row"><a href="DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></th>
+<td class="colLast">
+<div class="block">Class for storing temporary variables between controllers,
+ when the scene changes</div>
+</td>
</tr>
<tr class="altColor">
-<th class="colFirst" scope="row"><a href="LoginController.html" title="class in NTNU.IDATT1002.controllers">LoginController</a></th>
-<td class="colLast"> </td>
+<th class="colFirst" scope="row"><a href="Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></th>
+<td class="colLast">
+<div class="block">Controls the buttons and changeable elements on explore.fxml,
+ a page where you explore images</div>
+</td>
</tr>
<tr class="rowColor">
-<th class="colFirst" scope="row"><a href="SignUpController.html" title="class in NTNU.IDATT1002.controllers">SignUpController</a></th>
-<td class="colLast"> </td>
+<th class="colFirst" scope="row"><a href="ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></th>
+<td class="colLast">
+<div class="block">Controls the buttons and changeable elements on explore_albums.fxml,
+ a page where you explore albums</div>
+</td>
+</tr>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="Login.html" title="class in NTNU.IDATT1002.controllers">Login</a></th>
+<td class="colLast">
+<div class="block">Controls the buttons and changeable elements on login.fxml,
+ the page where you log into the application</div>
+</td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></th>
+<td class="colLast">
+<div class="block">Controls the buttons and changeable elements on main.fxml,
+ a page where you explore albums</div>
+</td>
+</tr>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></th>
+<td class="colLast">
+<div class="block">Controls the buttons and changeable elements on map.fxml,
+ a page where you can find images by location</div>
+</td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></th>
+<td class="colLast">
+<div class="block">Controls the buttons and changeable elements on search.fxml,
+ a page where you can search for images and sort them</div>
+</td>
+</tr>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></th>
+<td class="colLast">
+<div class="block">Controls the buttons and changeable elements on signup.fxml,
+ a page where you create a new user for the application</div>
+</td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></th>
+<td class="colLast">
+<div class="block">Controls the buttons and changeable elements on upload.fxml,
+ a page where you select images to upload</div>
+</td>
+</tr>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></th>
+<td class="colLast">
+<div class="block">Controls the buttons and changeable elements on upload_multiple.fxml,
+ a page where you add descriptions to your selected images</div>
+</td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></th>
+<td class="colLast">
+<div class="block">Controls the buttons and changeable elements on upload_single.fxml,
+ a page where you add descriptions to your selected image</div>
+</td>
+</tr>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></th>
+<td class="colLast">
+<div class="block">Controls the buttons and changeable elements on view_album.fxml,
+ a page where get a more detailed view of an album</div>
+</td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></th>
+<td class="colLast">
+<div class="block">Controls the buttons and changeable elements on view_.fxml,
+ a page where get a more detailed view of a picture</div>
+</td>
</tr>
</tbody>
</table>
diff --git a/javadoc/NTNU/IDATT1002/controllers/package-tree.html b/javadoc/NTNU/IDATT1002/controllers/package-tree.html
index 5b93b7a5edbe4ab8e4053668f3074da5fca13e89..554e14cf8d7c87ac2602391c50484e08d9933f08 100644
--- a/javadoc/NTNU/IDATT1002/controllers/package-tree.html
+++ b/javadoc/NTNU/IDATT1002/controllers/package-tree.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>NTNU.IDATT1002.controllers Class Hierarchy</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
@@ -106,10 +106,20 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<ul>
<li class="circle">java.lang.Object
<ul>
-<li class="circle">NTNU.IDATT1002.controllers.<a href="ExploreController.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">ExploreController</span></a></li>
-<li class="circle">NTNU.IDATT1002.controllers.<a href="LoggedInController.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">LoggedInController</span></a></li>
-<li class="circle">NTNU.IDATT1002.controllers.<a href="LoginController.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">LoginController</span></a></li>
-<li class="circle">NTNU.IDATT1002.controllers.<a href="SignUpController.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">SignUpController</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="CreateAlbum.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">CreateAlbum</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="DataExchange.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">DataExchange</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="Explore.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Explore</span></a> (implements javafx.fxml.Initializable)</li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">ExploreAlbums</span></a> (implements javafx.fxml.Initializable)</li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="Login.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Login</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="Main.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Main</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="Map.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Map</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="Search.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Search</span></a> (implements javafx.fxml.Initializable)</li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="SignUp.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">SignUp</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="Upload.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Upload</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">UploadedMultiple</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="UploadedSingle.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">UploadedSingle</span></a> (implements javafx.fxml.Initializable)</li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="ViewAlbum.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">ViewAlbum</span></a> (implements javafx.fxml.Initializable)</li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="ViewPicture.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">ViewPicture</span></a> (implements javafx.fxml.Initializable)</li>
</ul>
</li>
</ul>
diff --git a/javadoc/NTNU/IDATT1002/database/EntityManagerConfig.html b/javadoc/NTNU/IDATT1002/database/EntityManagerConfig.html
new file mode 100644
index 0000000000000000000000000000000000000000..f0727075cd319fa8dde338d76625f16716785ac7
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/database/EntityManagerConfig.html
@@ -0,0 +1,275 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>EntityManagerConfig</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="EntityManagerConfig";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li>Constr | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li>Constr | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.database</a></div>
+<h2 title="Class EntityManagerConfig" class="title">Class EntityManagerConfig</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.database.EntityManagerConfig</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">EntityManagerConfig</span>
+extends java.lang.Object</pre>
+<div class="block">Entity Manager Configuration Singleton for overriding hibernate persistence properties.
+ Provides a single global access point to the applications entity manager.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static javax.persistence.EntityManager</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getEntityManager()">getEntityManager</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Retrieve the entity manager instance.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="getEntityManager()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getEntityManager</h4>
+<pre class="methodSignature">public static javax.persistence.EntityManager getEntityManager()</pre>
+<div class="block">Retrieve the entity manager instance.
+ An entity manager is not created until it is requested.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>an entity manager instance</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li>Constr | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li>Constr | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/database/LoadDatabase.html b/javadoc/NTNU/IDATT1002/database/LoadDatabase.html
new file mode 100644
index 0000000000000000000000000000000000000000..1bf256542cb9076f323dbb6f9ff73d54f271c8cc
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/database/LoadDatabase.html
@@ -0,0 +1,306 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>LoadDatabase</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="LoadDatabase";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.database</a></div>
+<h2 title="Class LoadDatabase" class="title">Class LoadDatabase</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.database.LoadDatabase</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">LoadDatabase</span>
+extends java.lang.Object</pre>
+<div class="block">Loads test data into the database.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">LoadDatabase</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#load()">load</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>LoadDatabase</h4>
+<pre>public LoadDatabase()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="load()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>load</h4>
+<pre class="methodSignature">public static void load()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/database/package-summary.html b/javadoc/NTNU/IDATT1002/database/package-summary.html
new file mode 100644
index 0000000000000000000000000000000000000000..8161efde9f8a523d8e3527763399bae85a97f2ef
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/database/package-summary.html
@@ -0,0 +1,173 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>NTNU.IDATT1002.database</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="NTNU.IDATT1002.database";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="header">
+<h1 title="Package" class="title">Package NTNU.IDATT1002.database</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary">
+<caption><span>Class Summary</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="EntityManagerConfig.html" title="class in NTNU.IDATT1002.database">EntityManagerConfig</a></th>
+<td class="colLast">
+<div class="block">Entity Manager Configuration Singleton for overriding hibernate persistence properties.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="LoadDatabase.html" title="class in NTNU.IDATT1002.database">LoadDatabase</a></th>
+<td class="colLast">
+<div class="block">Loads test data into the database.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/database/package-tree.html b/javadoc/NTNU/IDATT1002/database/package-tree.html
new file mode 100644
index 0000000000000000000000000000000000000000..f4cbf64cd5e5cddd8b255077885fedd0eed67b67
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/database/package-tree.html
@@ -0,0 +1,163 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>NTNU.IDATT1002.database Class Hierarchy</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="NTNU.IDATT1002.database Class Hierarchy";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="header">
+<h1 class="title">Hierarchy For Package NTNU.IDATT1002.database</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../../../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<section role="region">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li class="circle">java.lang.Object
+<ul>
+<li class="circle">NTNU.IDATT1002.database.<a href="EntityManagerConfig.html" title="class in NTNU.IDATT1002.database"><span class="typeNameLink">EntityManagerConfig</span></a></li>
+<li class="circle">NTNU.IDATT1002.database.<a href="LoadDatabase.html" title="class in NTNU.IDATT1002.database"><span class="typeNameLink">LoadDatabase</span></a></li>
+</ul>
+</li>
+</ul>
+</section>
+</div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/filters/AlbumFilter.html b/javadoc/NTNU/IDATT1002/filters/AlbumFilter.html
new file mode 100644
index 0000000000000000000000000000000000000000..e62514000988dc63797eb6a17202a4ecd859acbb
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/filters/AlbumFilter.html
@@ -0,0 +1,315 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>AlbumFilter</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="AlbumFilter";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.filters</a></div>
+<h2 title="Class AlbumFilter" class="title">Class AlbumFilter</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.filters.AlbumFilter</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">AlbumFilter</span>
+extends java.lang.Object</pre>
+<div class="block">Album Filter. Class to filter an album by title, description and tag names.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">AlbumFilter</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static java.util.function.Predicate<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#filter(java.lang.String)">filter</a></span>​(java.lang.String query)</code></th>
+<td class="colLast">
+<div class="block">Chain the predicates and test the album by the given query.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>AlbumFilter</h4>
+<pre>public AlbumFilter()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="filter(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>filter</h4>
+<pre class="methodSignature">public static java.util.function.Predicate<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>> filter​(java.lang.String query)</pre>
+<div class="block">Chain the predicates and test the album by the given query.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>query</code> - the query to filter by</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>predicate chaining the album filter components.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/filters/ImageFilter.html b/javadoc/NTNU/IDATT1002/filters/ImageFilter.html
new file mode 100644
index 0000000000000000000000000000000000000000..712b1f3ebd41979eae05f131c9b959afb884b937
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/filters/ImageFilter.html
@@ -0,0 +1,317 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>ImageFilter</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="ImageFilter";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.filters</a></div>
+<h2 title="Class ImageFilter" class="title">Class ImageFilter</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.filters.ImageFilter</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">ImageFilter</span>
+extends java.lang.Object</pre>
+<div class="block">Album Filter. Class to filter an album by title, description and tag names.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">ImageFilter</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static java.util.function.Predicate<<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#filter(java.lang.String)">filter</a></span>​(java.lang.String query)</code></th>
+<td class="colLast">
+<div class="block">Image filter can filter an album by tags
+ Uses method filterByTags</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ImageFilter</h4>
+<pre>public ImageFilter()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="filter(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>filter</h4>
+<pre class="methodSignature">public static java.util.function.Predicate<<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>> filter​(java.lang.String query)</pre>
+<div class="block">Image filter can filter an album by tags
+ Uses method filterByTags</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>query</code> - the query to filter by</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>predicate chaining the album filter components.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/filters/package-summary.html b/javadoc/NTNU/IDATT1002/filters/package-summary.html
new file mode 100644
index 0000000000000000000000000000000000000000..ed5387eb390f421bfbe312bc97ee999d286d9c9c
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/filters/package-summary.html
@@ -0,0 +1,173 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>NTNU.IDATT1002.filters</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="NTNU.IDATT1002.filters";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="header">
+<h1 title="Package" class="title">Package NTNU.IDATT1002.filters</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary">
+<caption><span>Class Summary</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="AlbumFilter.html" title="class in NTNU.IDATT1002.filters">AlbumFilter</a></th>
+<td class="colLast">
+<div class="block">Album Filter.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="ImageFilter.html" title="class in NTNU.IDATT1002.filters">ImageFilter</a></th>
+<td class="colLast">
+<div class="block">Album Filter.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/filters/package-tree.html b/javadoc/NTNU/IDATT1002/filters/package-tree.html
new file mode 100644
index 0000000000000000000000000000000000000000..3a4978b4012bc616785db6c6eb945a5bd0386e40
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/filters/package-tree.html
@@ -0,0 +1,163 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>NTNU.IDATT1002.filters Class Hierarchy</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="NTNU.IDATT1002.filters Class Hierarchy";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="header">
+<h1 class="title">Hierarchy For Package NTNU.IDATT1002.filters</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../../../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<section role="region">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li class="circle">java.lang.Object
+<ul>
+<li class="circle">NTNU.IDATT1002.filters.<a href="AlbumFilter.html" title="class in NTNU.IDATT1002.filters"><span class="typeNameLink">AlbumFilter</span></a></li>
+<li class="circle">NTNU.IDATT1002.filters.<a href="ImageFilter.html" title="class in NTNU.IDATT1002.filters"><span class="typeNameLink">ImageFilter</span></a></li>
+</ul>
+</li>
+</ul>
+</section>
+</div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/models/Album.html b/javadoc/NTNU/IDATT1002/models/Album.html
new file mode 100644
index 0000000000000000000000000000000000000000..da6e00fbba69ae6118432bf2796ce70dec1174a7
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/models/Album.html
@@ -0,0 +1,613 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>Album</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Album";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.models</a></div>
+<h2 title="Class Album" class="title">Class Album</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.models.Album</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>@Entity
+public class <span class="typeNameLabel">Album</span>
+extends java.lang.Object</pre>
+<div class="block">Class Album representing an album. Contains <a href="Image.html" title="class in NTNU.IDATT1002.models"><code>Image</code></a>s and the creator (<a href="User.html" title="class in NTNU.IDATT1002.models"><code>User</code></a>)</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">Album</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addImage(NTNU.IDATT1002.models.Image)">addImage</a></span>​(<a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a> image)</code></th>
+<td class="colLast">
+<div class="block">Add given image to this album.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addTag(NTNU.IDATT1002.models.Tag)">addTag</a></span>​(<a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a> tag)</code></th>
+<td class="colLast">
+<div class="block">Add given tag to this album</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#equals(java.lang.Object)">equals</a></span>​(java.lang.Object o)</code></th>
+<td class="colLast">
+<div class="block">Check if this and given entity are equal.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.util.Date</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getCreatedAt()">getCreatedAt</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getDescription()">getDescription</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.lang.Long</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getId()">getId</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>java.util.List<<a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getImages()">getImages</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>java.util.List<<a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getTags()">getTags</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getTitle()">getTitle</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>java.util.Date</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getUpdatedAt()">getUpdatedAt</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code><a href="User.html" title="class in NTNU.IDATT1002.models">User</a></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getUser()">getUser</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#removeImage(NTNU.IDATT1002.models.Image)">removeImage</a></span>​(<a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a> image)</code></th>
+<td class="colLast">
+<div class="block">Remove given image from the album.</div>
+</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#removeTag(NTNU.IDATT1002.models.Tag)">removeTag</a></span>​(<a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a> tag)</code></th>
+<td class="colLast">
+<div class="block">Remove given tag to this album</div>
+</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setCreatedAt(java.util.Date)">setCreatedAt</a></span>​(java.util.Date createdAt)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setDescription(java.lang.String)">setDescription</a></span>​(java.lang.String description)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setId(java.lang.Long)">setId</a></span>​(java.lang.Long id)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i16" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setImages(java.util.List)">setImages</a></span>​(java.util.List<<a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a>> images)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setTags(java.util.List)">setTags</a></span>​(java.util.List<<a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>> tags)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setTitle(java.lang.String)">setTitle</a></span>​(java.lang.String title)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setUser(NTNU.IDATT1002.models.User)">setUser</a></span>​(<a href="User.html" title="class in NTNU.IDATT1002.models">User</a> user)</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Album</h4>
+<pre>public Album()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="setId(java.lang.Long)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setId</h4>
+<pre class="methodSignature">public void setId​(java.lang.Long id)</pre>
+</li>
+</ul>
+<a id="getId()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getId</h4>
+<pre class="methodSignature">public java.lang.Long getId()</pre>
+</li>
+</ul>
+<a id="getTitle()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTitle</h4>
+<pre class="methodSignature">public java.lang.String getTitle()</pre>
+</li>
+</ul>
+<a id="getUser()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getUser</h4>
+<pre class="methodSignature">public <a href="User.html" title="class in NTNU.IDATT1002.models">User</a> getUser()</pre>
+</li>
+</ul>
+<a id="getImages()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getImages</h4>
+<pre class="methodSignature">public java.util.List<<a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a>> getImages()</pre>
+</li>
+</ul>
+<a id="getDescription()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDescription</h4>
+<pre class="methodSignature">public java.lang.String getDescription()</pre>
+</li>
+</ul>
+<a id="getCreatedAt()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCreatedAt</h4>
+<pre class="methodSignature">public java.util.Date getCreatedAt()</pre>
+</li>
+</ul>
+<a id="getUpdatedAt()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getUpdatedAt</h4>
+<pre class="methodSignature">public java.util.Date getUpdatedAt()</pre>
+</li>
+</ul>
+<a id="getTags()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTags</h4>
+<pre class="methodSignature">public java.util.List<<a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>> getTags()</pre>
+</li>
+</ul>
+<a id="setTitle(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setTitle</h4>
+<pre class="methodSignature">public void setTitle​(java.lang.String title)</pre>
+</li>
+</ul>
+<a id="setDescription(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setDescription</h4>
+<pre class="methodSignature">public void setDescription​(java.lang.String description)</pre>
+</li>
+</ul>
+<a id="setUser(NTNU.IDATT1002.models.User)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setUser</h4>
+<pre class="methodSignature">public void setUser​(<a href="User.html" title="class in NTNU.IDATT1002.models">User</a> user)</pre>
+</li>
+</ul>
+<a id="setTags(java.util.List)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setTags</h4>
+<pre class="methodSignature">public void setTags​(java.util.List<<a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>> tags)</pre>
+</li>
+</ul>
+<a id="setImages(java.util.List)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setImages</h4>
+<pre class="methodSignature">public void setImages​(java.util.List<<a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a>> images)</pre>
+</li>
+</ul>
+<a id="setCreatedAt(java.util.Date)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setCreatedAt</h4>
+<pre class="methodSignature">public void setCreatedAt​(java.util.Date createdAt)</pre>
+</li>
+</ul>
+<a id="addImage(NTNU.IDATT1002.models.Image)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addImage</h4>
+<pre class="methodSignature">public void addImage​(<a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a> image)</pre>
+<div class="block">Add given image to this album.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>image</code> - the image to add</dd>
+</dl>
+</li>
+</ul>
+<a id="removeImage(NTNU.IDATT1002.models.Image)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeImage</h4>
+<pre class="methodSignature">public void removeImage​(<a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a> image)</pre>
+<div class="block">Remove given image from the album.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>image</code> - the image to add</dd>
+</dl>
+</li>
+</ul>
+<a id="addTag(NTNU.IDATT1002.models.Tag)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addTag</h4>
+<pre class="methodSignature">public void addTag​(<a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a> tag)</pre>
+<div class="block">Add given tag to this album</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>tag</code> - the tag to add</dd>
+</dl>
+</li>
+</ul>
+<a id="removeTag(NTNU.IDATT1002.models.Tag)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeTag</h4>
+<pre class="methodSignature">public void removeTag​(<a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a> tag)</pre>
+<div class="block">Remove given tag to this album</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>tag</code> - the tag to add</dd>
+</dl>
+</li>
+</ul>
+<a id="equals(java.lang.Object)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>equals</h4>
+<pre class="methodSignature">public boolean equals​(java.lang.Object o)</pre>
+<div class="block">Check if this and given entity are equal.
+ The two are defined as equal if all individual fields are equal.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>equals</code> in class <code>java.lang.Object</code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>o</code> - object to check for equality against</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>true if this is equal to given object, else false</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/models/GeoLocation.html b/javadoc/NTNU/IDATT1002/models/GeoLocation.html
new file mode 100644
index 0000000000000000000000000000000000000000..c07dfb92cb4fb1afd93ef1a439b5fc86ccdddbe5
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/models/GeoLocation.html
@@ -0,0 +1,414 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>GeoLocation</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="GeoLocation";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.models</a></div>
+<h2 title="Class GeoLocation" class="title">Class GeoLocation</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.models.GeoLocation</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>@Entity
+public class <span class="typeNameLabel">GeoLocation</span>
+extends java.lang.Object</pre>
+<div class="block">Creates table Geolocation</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">GeoLocation</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.lang.String,java.lang.String)">GeoLocation</a></span>​(java.lang.String latitude,
+ java.lang.String longitude)</code></th>
+<td class="colLast">
+<div class="block">Creates constructor for geolocation that takes in each parameter</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.lang.Long</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getGeoLocationId()">getGeoLocationId</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getLatitude()">getLatitude</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getLongitude()">getLongitude</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setGeoLocationId(java.lang.Long)">setGeoLocationId</a></span>​(java.lang.Long geoLocationId)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setLatitude(java.lang.String)">setLatitude</a></span>​(java.lang.String altitude)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setLongitude(java.lang.String)">setLongitude</a></span>​(java.lang.String longitude)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setMetadata(NTNU.IDATT1002.models.Metadata)">setMetadata</a></span>​(<a href="Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a> metadata)</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>GeoLocation</h4>
+<pre>public GeoLocation()</pre>
+</li>
+</ul>
+<a id="<init>(java.lang.String,java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>GeoLocation</h4>
+<pre>public GeoLocation​(java.lang.String latitude,
+ java.lang.String longitude)</pre>
+<div class="block">Creates constructor for geolocation that takes in each parameter</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>latitude</code> - </dd>
+<dd><code>longitude</code> - </dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="getGeoLocationId()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getGeoLocationId</h4>
+<pre class="methodSignature">public java.lang.Long getGeoLocationId()</pre>
+</li>
+</ul>
+<a id="getLatitude()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLatitude</h4>
+<pre class="methodSignature">public java.lang.String getLatitude()</pre>
+</li>
+</ul>
+<a id="getLongitude()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLongitude</h4>
+<pre class="methodSignature">public java.lang.String getLongitude()</pre>
+</li>
+</ul>
+<a id="setGeoLocationId(java.lang.Long)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setGeoLocationId</h4>
+<pre class="methodSignature">public void setGeoLocationId​(java.lang.Long geoLocationId)</pre>
+</li>
+</ul>
+<a id="setLatitude(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setLatitude</h4>
+<pre class="methodSignature">public void setLatitude​(java.lang.String altitude)</pre>
+</li>
+</ul>
+<a id="setLongitude(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setLongitude</h4>
+<pre class="methodSignature">public void setLongitude​(java.lang.String longitude)</pre>
+</li>
+</ul>
+<a id="setMetadata(NTNU.IDATT1002.models.Metadata)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setMetadata</h4>
+<pre class="methodSignature">public void setMetadata​(<a href="Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a> metadata)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/models/Histogram.html b/javadoc/NTNU/IDATT1002/models/Histogram.html
new file mode 100644
index 0000000000000000000000000000000000000000..2b7f2853e984b22a6d1c6b1a2c6a49a2fd73ab9c
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/models/Histogram.html
@@ -0,0 +1,363 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>Histogram</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Histogram";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.models</a></div>
+<h2 title="Class Histogram" class="title">Class Histogram</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.models.Histogram</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>@Entity
+public class <span class="typeNameLabel">Histogram</span>
+extends java.lang.Object</pre>
+<div class="block">Creates histogram table</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">Histogram</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getData()">getData</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.Long</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getHistogramId()">getHistogramId</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setData(java.lang.String)">setData</a></span>​(java.lang.String data)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setHistogramId(java.lang.Long)">setHistogramId</a></span>​(java.lang.Long histogramId)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setMetadata(NTNU.IDATT1002.models.Metadata)">setMetadata</a></span>​(<a href="Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a> metadata)</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Histogram</h4>
+<pre>public Histogram()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="getHistogramId()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getHistogramId</h4>
+<pre class="methodSignature">public java.lang.Long getHistogramId()</pre>
+</li>
+</ul>
+<a id="getData()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getData</h4>
+<pre class="methodSignature">public java.lang.String getData()</pre>
+</li>
+</ul>
+<a id="setHistogramId(java.lang.Long)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setHistogramId</h4>
+<pre class="methodSignature">public void setHistogramId​(java.lang.Long histogramId)</pre>
+</li>
+</ul>
+<a id="setData(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setData</h4>
+<pre class="methodSignature">public void setData​(java.lang.String data)</pre>
+</li>
+</ul>
+<a id="setMetadata(NTNU.IDATT1002.models.Metadata)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setMetadata</h4>
+<pre class="methodSignature">public void setMetadata​(<a href="Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a> metadata)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/models/Image.html b/javadoc/NTNU/IDATT1002/models/Image.html
index e4a2c995ab550e7bf879c4bc1550577d3362e178..76d9250e59a9858a163deee908f73adbe75cbefa 100644
--- a/javadoc/NTNU/IDATT1002/models/Image.html
+++ b/javadoc/NTNU/IDATT1002/models/Image.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>Image</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
@@ -28,6 +28,12 @@
catch(err) {
}
//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
var pathtoroot = "../../../";
var useModuleDirectories = true;
loadScripts(document, 'script');</script>
@@ -92,7 +98,7 @@ loadScripts(document, 'script');</script>
<li>Detail: </li>
<li>Field | </li>
<li><a href="#constructor.detail">Constr</a> | </li>
-<li>Method</li>
+<li><a href="#method.detail">Method</a></li>
</ul>
</div>
<a id="skip.navbar.top">
@@ -152,6 +158,14 @@ extends java.lang.Object</pre>
<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">Image</a></span>()</code></th>
<td class="colLast"> </td>
</tr>
+<tr class="rowColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(byte%5B%5D,NTNU.IDATT1002.models.Album,NTNU.IDATT1002.models.User,NTNU.IDATT1002.models.Metadata,java.lang.String)">Image</a></span>​(byte[] rawImage,
+ <a href="Album.html" title="class in NTNU.IDATT1002.models">Album</a> album,
+ <a href="User.html" title="class in NTNU.IDATT1002.models">User</a> user,
+ <a href="Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a> metadata,
+ java.lang.String path)</code></th>
+<td class="colLast"> </td>
+</tr>
</table>
</li>
</ul>
@@ -163,12 +177,109 @@ extends java.lang.Object</pre>
<!-- -->
</a>
<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addAlbum(NTNU.IDATT1002.models.Album)">addAlbum</a></span>​(<a href="Album.html" title="class in NTNU.IDATT1002.models">Album</a> album)</code></th>
+<td class="colLast">
+<div class="block">Add this image in the given album.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addTag(NTNU.IDATT1002.models.Tag)">addTag</a></span>​(<a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a> tag)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addTags(java.util.ArrayList)">addTags</a></span>​(java.util.ArrayList<<a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>> tags)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#equals(java.lang.Object)">equals</a></span>​(java.lang.Object o)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.util.List<<a href="Album.html" title="class in NTNU.IDATT1002.models">Album</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAlbums()">getAlbums</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.lang.Long</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getId()">getId</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code><a href="Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getMetadata()">getMetadata</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getPath()">getPath</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>byte[]</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getRawImage()">getRawImage</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>java.util.List<<a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getTags()">getTags</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>java.util.Date</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getUploadedAt()">getUploadedAt</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#removeAlbum(NTNU.IDATT1002.models.Album)">removeAlbum</a></span>​(<a href="Album.html" title="class in NTNU.IDATT1002.models">Album</a> album)</code></th>
+<td class="colLast">
+<div class="block">Remove this image from the given image.</div>
+</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setId(java.lang.Long)">setId</a></span>​(java.lang.Long id)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setMetadata(NTNU.IDATT1002.models.Metadata)">setMetadata</a></span>​(<a href="Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a> metadata)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setPath(java.lang.String)">setPath</a></span>​(java.lang.String path)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setRawImage(byte%5B%5D)">setRawImage</a></span>​(byte[] rawImage)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i16" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setUser(NTNU.IDATT1002.models.User)">setUser</a></span>​(<a href="User.html" title="class in NTNU.IDATT1002.models">User</a> user)</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
<ul class="blockList">
<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
<!-- -->
</a>
<h3>Methods inherited from class java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+<code>clone, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
</ul>
</li>
</ul>
@@ -189,12 +300,202 @@ extends java.lang.Object</pre>
<a id="<init>()">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>Image</h4>
<pre>public Image()</pre>
</li>
</ul>
+<a id="<init>(byte[],NTNU.IDATT1002.models.Album,NTNU.IDATT1002.models.User,NTNU.IDATT1002.models.Metadata,java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Image</h4>
+<pre>public Image​(byte[] rawImage,
+ <a href="Album.html" title="class in NTNU.IDATT1002.models">Album</a> album,
+ <a href="User.html" title="class in NTNU.IDATT1002.models">User</a> user,
+ <a href="Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a> metadata,
+ java.lang.String path)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="getId()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getId</h4>
+<pre class="methodSignature">public java.lang.Long getId()</pre>
+</li>
+</ul>
+<a id="setId(java.lang.Long)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setId</h4>
+<pre class="methodSignature">public void setId​(java.lang.Long id)</pre>
+</li>
+</ul>
+<a id="getRawImage()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getRawImage</h4>
+<pre class="methodSignature">public byte[] getRawImage()</pre>
+</li>
+</ul>
+<a id="setRawImage(byte[])">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setRawImage</h4>
+<pre class="methodSignature">public void setRawImage​(byte[] rawImage)</pre>
+</li>
+</ul>
+<a id="setUser(NTNU.IDATT1002.models.User)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setUser</h4>
+<pre class="methodSignature">public void setUser​(<a href="User.html" title="class in NTNU.IDATT1002.models">User</a> user)</pre>
+</li>
+</ul>
+<a id="setMetadata(NTNU.IDATT1002.models.Metadata)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setMetadata</h4>
+<pre class="methodSignature">public void setMetadata​(<a href="Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a> metadata)</pre>
+</li>
+</ul>
+<a id="setPath(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPath</h4>
+<pre class="methodSignature">public void setPath​(java.lang.String path)</pre>
+</li>
+</ul>
+<a id="getAlbums()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAlbums</h4>
+<pre class="methodSignature">public java.util.List<<a href="Album.html" title="class in NTNU.IDATT1002.models">Album</a>> getAlbums()</pre>
+</li>
+</ul>
+<a id="addTags(java.util.ArrayList)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addTags</h4>
+<pre class="methodSignature">public void addTags​(java.util.ArrayList<<a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>> tags)</pre>
+</li>
+</ul>
+<a id="addTag(NTNU.IDATT1002.models.Tag)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addTag</h4>
+<pre class="methodSignature">public void addTag​(<a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a> tag)</pre>
+</li>
+</ul>
+<a id="getTags()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTags</h4>
+<pre class="methodSignature">public java.util.List<<a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>> getTags()</pre>
+</li>
+</ul>
+<a id="getMetadata()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMetadata</h4>
+<pre class="methodSignature">public <a href="Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a> getMetadata()</pre>
+</li>
+</ul>
+<a id="getUploadedAt()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getUploadedAt</h4>
+<pre class="methodSignature">public java.util.Date getUploadedAt()</pre>
+</li>
+</ul>
+<a id="getPath()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPath</h4>
+<pre class="methodSignature">public java.lang.String getPath()</pre>
+</li>
+</ul>
+<a id="addAlbum(NTNU.IDATT1002.models.Album)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addAlbum</h4>
+<pre class="methodSignature">public void addAlbum​(<a href="Album.html" title="class in NTNU.IDATT1002.models">Album</a> album)</pre>
+<div class="block">Add this image in the given album.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>album</code> - the album to add to</dd>
+</dl>
+</li>
+</ul>
+<a id="removeAlbum(NTNU.IDATT1002.models.Album)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeAlbum</h4>
+<pre class="methodSignature">public void removeAlbum​(<a href="Album.html" title="class in NTNU.IDATT1002.models">Album</a> album)</pre>
+<div class="block">Remove this image from the given image.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>album</code> - the album to remove from</dd>
+</dl>
+</li>
+</ul>
+<a id="equals(java.lang.Object)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>equals</h4>
+<pre class="methodSignature">public boolean equals​(java.lang.Object o)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>equals</code> in class <code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
</li>
</ul>
</section>
@@ -255,7 +556,7 @@ extends java.lang.Object</pre>
<li>Detail: </li>
<li>Field | </li>
<li><a href="#constructor.detail">Constr</a> | </li>
-<li>Method</li>
+<li><a href="#method.detail">Method</a></li>
</ul>
</div>
<a id="skip.navbar.bottom">
diff --git a/javadoc/NTNU/IDATT1002/models/ImageAlbum.html b/javadoc/NTNU/IDATT1002/models/ImageAlbum.html
index 92c27b21f9642cd4dad233a7f680ed643996b01d..a6258008979057500758efc210533ef620f3956b 100644
--- a/javadoc/NTNU/IDATT1002/models/ImageAlbum.html
+++ b/javadoc/NTNU/IDATT1002/models/ImageAlbum.html
@@ -3,7 +3,7 @@
<html lang="no">
<head>
<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
-<title>ImageAlbum</title>
+<title>Album</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="dc.created" content="2020-03-19">
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
@@ -22,7 +22,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="ImageAlbum";
+ parent.document.title="Album";
}
}
catch(err) {
@@ -117,14 +117,14 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<main role="main">
<div class="header">
<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.models</a></div>
-<h2 title="Class ImageAlbum" class="title">Class ImageAlbum</h2>
+<h2 title="Class Album" class="title">Class Album</h2>
</div>
<div class="contentContainer">
<ul class="inheritance">
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
-<li>NTNU.IDATT1002.models.ImageAlbum</li>
+<li>NTNU.IDATT1002.models.Album</li>
</ul>
</li>
</ul>
@@ -133,9 +133,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li class="blockList">
<hr>
<pre>@Entity
-public class <span class="typeNameLabel">ImageAlbum</span>
+public class <span class="typeNameLabel">Album</span>
extends java.lang.Object</pre>
-<div class="block">Class ImageAlbum representing an image album. Contains <a href="Image.html" title="class in NTNU.IDATT1002.models"><code>Image</code></a>s and the creator - <a href="User.html" title="class in NTNU.IDATT1002.models"><code>User</code></a></div>
+<div class="block">Class Album representing an album. Contains <a href="Image.html" title="class in NTNU.IDATT1002.models"><code>Image</code></a>s and the creator - <a href="User.html" title="class in NTNU.IDATT1002.models"><code>User</code></a></div>
</li>
</ul>
</div>
@@ -156,7 +156,7 @@ extends java.lang.Object</pre>
<th class="colLast" scope="col">Description</th>
</tr>
<tr class="altColor">
-<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">ImageAlbum</a></span>()</code></th>
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">Album</a></span>()</code></th>
<td class="colLast"> </td>
</tr>
</table>
@@ -231,8 +231,8 @@ extends java.lang.Object</pre>
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>ImageAlbum</h4>
-<pre>public ImageAlbum()</pre>
+<h4>Album</h4>
+<pre>public Album()</pre>
</li>
</ul>
</li>
diff --git a/javadoc/NTNU/IDATT1002/models/Login.html b/javadoc/NTNU/IDATT1002/models/Login.html
new file mode 100644
index 0000000000000000000000000000000000000000..2594950706fc1a0d2b1ba85d9e3b6d2072990663
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/models/Login.html
@@ -0,0 +1,406 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>Login</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Login";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.models</a></div>
+<h2 title="Class Login" class="title">Class Login</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.models.Login</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>@Entity
+public class <span class="typeNameLabel">Login</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">Login</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(NTNU.IDATT1002.models.User)">Login</a></span>​(<a href="User.html" title="class in NTNU.IDATT1002.models">User</a> user)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(NTNU.IDATT1002.models.User,java.lang.String,java.lang.String)">Login</a></span>​(<a href="User.html" title="class in NTNU.IDATT1002.models">User</a> user,
+ java.lang.String passwordSalt,
+ java.lang.String hash)</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getHash()">getHash</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getPasswordSalt()">getPasswordSalt</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="User.html" title="class in NTNU.IDATT1002.models">User</a></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getUser()">getUser</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setHash(java.lang.String)">setHash</a></span>​(java.lang.String hash)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setPasswordSalt(java.lang.String)">setPasswordSalt</a></span>​(java.lang.String passwordSalt)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setUser(NTNU.IDATT1002.models.User)">setUser</a></span>​(<a href="User.html" title="class in NTNU.IDATT1002.models">User</a> user)</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Login</h4>
+<pre>public Login()</pre>
+</li>
+</ul>
+<a id="<init>(NTNU.IDATT1002.models.User)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Login</h4>
+<pre>public Login​(<a href="User.html" title="class in NTNU.IDATT1002.models">User</a> user)</pre>
+</li>
+</ul>
+<a id="<init>(NTNU.IDATT1002.models.User,java.lang.String,java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Login</h4>
+<pre>public Login​(<a href="User.html" title="class in NTNU.IDATT1002.models">User</a> user,
+ java.lang.String passwordSalt,
+ java.lang.String hash)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="getUser()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getUser</h4>
+<pre class="methodSignature">public <a href="User.html" title="class in NTNU.IDATT1002.models">User</a> getUser()</pre>
+</li>
+</ul>
+<a id="setUser(NTNU.IDATT1002.models.User)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setUser</h4>
+<pre class="methodSignature">public void setUser​(<a href="User.html" title="class in NTNU.IDATT1002.models">User</a> user)</pre>
+</li>
+</ul>
+<a id="setHash(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setHash</h4>
+<pre class="methodSignature">public void setHash​(java.lang.String hash)</pre>
+</li>
+</ul>
+<a id="setPasswordSalt(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPasswordSalt</h4>
+<pre class="methodSignature">public void setPasswordSalt​(java.lang.String passwordSalt)</pre>
+</li>
+</ul>
+<a id="getHash()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getHash</h4>
+<pre class="methodSignature">public java.lang.String getHash()</pre>
+</li>
+</ul>
+<a id="getPasswordSalt()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getPasswordSalt</h4>
+<pre class="methodSignature">public java.lang.String getPasswordSalt()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/models/Metadata.html b/javadoc/NTNU/IDATT1002/models/Metadata.html
new file mode 100644
index 0000000000000000000000000000000000000000..32b59304561d1f56b9c90b5491d268aaa7e42306
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/models/Metadata.html
@@ -0,0 +1,408 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>Metadata</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Metadata";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.models</a></div>
+<h2 title="Class Metadata" class="title">Class Metadata</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.models.Metadata</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>@Entity
+public class <span class="typeNameLabel">Metadata</span>
+extends java.lang.Object</pre>
+<div class="block">Creates Metadata table</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">Metadata</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(NTNU.IDATT1002.models.Image,NTNU.IDATT1002.models.GeoLocation,NTNU.IDATT1002.models.Histogram)">Metadata</a></span>​(<a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a> image,
+ <a href="GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a> geoLocation,
+ <a href="Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a> histogram)</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getGeoLocation()">getGeoLocation</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getHistogram()">getHistogram</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code><a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getImage()">getImage</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.lang.Long</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getMetadataId()">getMetadataId</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setGeoLocation(NTNU.IDATT1002.models.GeoLocation)">setGeoLocation</a></span>​(<a href="GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a> geolocation)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setHistogram(NTNU.IDATT1002.models.Histogram)">setHistogram</a></span>​(<a href="Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a> histogram)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setImage(NTNU.IDATT1002.models.Image)">setImage</a></span>​(<a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a> image)</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Metadata</h4>
+<pre>public Metadata()</pre>
+</li>
+</ul>
+<a id="<init>(NTNU.IDATT1002.models.Image,NTNU.IDATT1002.models.GeoLocation,NTNU.IDATT1002.models.Histogram)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Metadata</h4>
+<pre>public Metadata​(<a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a> image,
+ <a href="GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a> geoLocation,
+ <a href="Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a> histogram)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="getMetadataId()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getMetadataId</h4>
+<pre class="methodSignature">public java.lang.Long getMetadataId()</pre>
+</li>
+</ul>
+<a id="getImage()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getImage</h4>
+<pre class="methodSignature">public <a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a> getImage()</pre>
+</li>
+</ul>
+<a id="getGeoLocation()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getGeoLocation</h4>
+<pre class="methodSignature">public <a href="GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a> getGeoLocation()</pre>
+</li>
+</ul>
+<a id="getHistogram()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getHistogram</h4>
+<pre class="methodSignature">public <a href="Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a> getHistogram()</pre>
+</li>
+</ul>
+<a id="setImage(NTNU.IDATT1002.models.Image)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setImage</h4>
+<pre class="methodSignature">public void setImage​(<a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a> image)</pre>
+</li>
+</ul>
+<a id="setGeoLocation(NTNU.IDATT1002.models.GeoLocation)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setGeoLocation</h4>
+<pre class="methodSignature">public void setGeoLocation​(<a href="GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a> geolocation)</pre>
+</li>
+</ul>
+<a id="setHistogram(NTNU.IDATT1002.models.Histogram)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>setHistogram</h4>
+<pre class="methodSignature">public void setHistogram​(<a href="Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a> histogram)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/models/Tag.html b/javadoc/NTNU/IDATT1002/models/Tag.html
new file mode 100644
index 0000000000000000000000000000000000000000..3750565297300afbf792c67640770bcfc35a49d2
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/models/Tag.html
@@ -0,0 +1,430 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>Tag</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="Tag";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.models</a></div>
+<h2 title="Class Tag" class="title">Class Tag</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.models.Tag</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>@Entity
+public class <span class="typeNameLabel">Tag</span>
+extends java.lang.Object</pre>
+<div class="block">Creates table named tag</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">Tag</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.lang.Long,java.lang.String)">Tag</a></span>​(java.lang.Long tagId,
+ java.lang.String name)</code></th>
+<td class="colLast">
+<div class="block">Constructor with tagId and name as parameters</div>
+</td>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.lang.String)">Tag</a></span>​(java.lang.String name)</code></th>
+<td class="colLast">
+<div class="block">Contructor to set initial tag name.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(NTNU.IDATT1002.models.Tag)">Tag</a></span>​(<a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a> tag)</code></th>
+<td class="colLast">
+<div class="block">Constructor thar takes in a tag object</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#equals(java.lang.Object)">equals</a></span>​(java.lang.Object o)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getName()">getName</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>java.lang.Long</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getTagId()">getTagId</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setName(java.lang.String)">setName</a></span>​(java.lang.String name)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setTagId(java.lang.Long)">setTagId</a></span>​(java.lang.Long tagId)</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Tag</h4>
+<pre>public Tag()</pre>
+</li>
+</ul>
+<a id="<init>(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Tag</h4>
+<pre>public Tag​(java.lang.String name)</pre>
+<div class="block">Contructor to set initial tag name.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>name</code> - the name of the tag</dd>
+</dl>
+</li>
+</ul>
+<a id="<init>(java.lang.Long,java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>Tag</h4>
+<pre>public Tag​(java.lang.Long tagId,
+ java.lang.String name)</pre>
+<div class="block">Constructor with tagId and name as parameters</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>tagId</code> - </dd>
+<dd><code>name</code> - </dd>
+</dl>
+</li>
+</ul>
+<a id="<init>(NTNU.IDATT1002.models.Tag)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Tag</h4>
+<pre>public Tag​(<a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a> tag)</pre>
+<div class="block">Constructor thar takes in a tag object</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>tag</code> - </dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="getTagId()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTagId</h4>
+<pre class="methodSignature">public java.lang.Long getTagId()</pre>
+</li>
+</ul>
+<a id="getName()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getName</h4>
+<pre class="methodSignature">public java.lang.String getName()</pre>
+</li>
+</ul>
+<a id="setTagId(java.lang.Long)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setTagId</h4>
+<pre class="methodSignature">public void setTagId​(java.lang.Long tagId)</pre>
+</li>
+</ul>
+<a id="setName(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setName</h4>
+<pre class="methodSignature">public void setName​(java.lang.String name)</pre>
+</li>
+</ul>
+<a id="equals(java.lang.Object)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>equals</h4>
+<pre class="methodSignature">public boolean equals​(java.lang.Object o)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>equals</code> in class <code>java.lang.Object</code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/models/User.html b/javadoc/NTNU/IDATT1002/models/User.html
index f46a7a6a9f8a5b0bb66531b288df36a4ecd52b2d..37e50a0a4187dc2c1ca05e0c293605b6f07dc7a1 100644
--- a/javadoc/NTNU/IDATT1002/models/User.html
+++ b/javadoc/NTNU/IDATT1002/models/User.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>User</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
@@ -28,7 +28,7 @@
catch(err) {
}
//-->
-var data = {"i0":10,"i1":10};
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -158,6 +158,16 @@ extends java.lang.Object</pre>
<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">User</a></span>()</code></th>
<td class="colLast"> </td>
</tr>
+<tr class="rowColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.util.Date)">User</a></span>​(java.lang.String username,
+ java.lang.String email,
+ java.lang.String firstName,
+ java.lang.String lastName,
+ java.lang.String callingCode,
+ java.lang.String phoneNumber,
+ java.util.Date birthDate)</code></th>
+<td class="colLast"> </td>
+</tr>
</table>
</li>
</ul>
@@ -178,12 +188,115 @@ extends java.lang.Object</pre>
</tr>
<tr id="i0" class="altColor">
<td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addImageAlbum(NTNU.IDATT1002.models.ImageAlbum)">addImageAlbum</a></span>​(<a href="ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a> imageAlbum)</code></th>
-<td class="colLast"> </td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addAlbum(NTNU.IDATT1002.models.Album)">addAlbum</a></span>​(<a href="Album.html" title="class in NTNU.IDATT1002.models">Album</a> album)</code></th>
+<td class="colLast">
+<div class="block">Add given album.</div>
+</td>
</tr>
<tr id="i1" class="rowColor">
<td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#removeImageAlbum(NTNU.IDATT1002.models.ImageAlbum)">removeImageAlbum</a></span>​(<a href="ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a> imageAlbum)</code></th>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addImage(NTNU.IDATT1002.models.Image)">addImage</a></span>​(<a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a> image)</code></th>
+<td class="colLast">
+<div class="block">Add given image.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#equals(java.lang.Object)">equals</a></span>​(java.lang.Object o)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.util.Date</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getBirthDate()">getBirthDate</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getCallingCode()">getCallingCode</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getEmail()">getEmail</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getFirstName()">getFirstName</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getLastName()">getLastName</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getPhoneNumber()">getPhoneNumber</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getUsername()">getUsername</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#isActive()">isActive</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#isAdmin()">isAdmin</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#removeAlbum(NTNU.IDATT1002.models.Album)">removeAlbum</a></span>​(<a href="Album.html" title="class in NTNU.IDATT1002.models">Album</a> album)</code></th>
+<td class="colLast">
+<div class="block">Remove given album.</div>
+</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#removeAlbum(NTNU.IDATT1002.models.Image)">removeAlbum</a></span>​(<a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a> image)</code></th>
+<td class="colLast">
+<div class="block">Remove given image.</div>
+</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setBirthDate(java.util.Date)">setBirthDate</a></span>​(java.util.Date birthDate)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setCallingCode(java.lang.String)">setCallingCode</a></span>​(java.lang.String callingCode)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i16" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setEmail(java.lang.String)">setEmail</a></span>​(java.lang.String email)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setFirstName(java.lang.String)">setFirstName</a></span>​(java.lang.String firstName)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i18" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setLastName(java.lang.String)">setLastName</a></span>​(java.lang.String lastName)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setPhoneNumber(java.lang.String)">setPhoneNumber</a></span>​(java.lang.String phoneNumber)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i20" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setUsername(java.lang.String)">setUsername</a></span>​(java.lang.String username)</code></th>
<td class="colLast"> </td>
</tr>
</table>
@@ -192,7 +305,7 @@ extends java.lang.Object</pre>
<!-- -->
</a>
<h3>Methods inherited from class java.lang.Object</h3>
-<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+<code>clone, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
</ul>
</li>
</ul>
@@ -213,12 +326,27 @@ extends java.lang.Object</pre>
<a id="<init>()">
<!-- -->
</a>
-<ul class="blockListLast">
+<ul class="blockList">
<li class="blockList">
<h4>User</h4>
<pre>public User()</pre>
</li>
</ul>
+<a id="<init>(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.util.Date)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>User</h4>
+<pre>public User​(java.lang.String username,
+ java.lang.String email,
+ java.lang.String firstName,
+ java.lang.String lastName,
+ java.lang.String callingCode,
+ java.lang.String phoneNumber,
+ java.util.Date birthDate)</pre>
+</li>
+</ul>
</li>
</ul>
</section>
@@ -229,22 +357,217 @@ extends java.lang.Object</pre>
<!-- -->
</a>
<h3>Method Detail</h3>
-<a id="addImageAlbum(NTNU.IDATT1002.models.ImageAlbum)">
+<a id="getEmail()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getEmail</h4>
+<pre class="methodSignature">public java.lang.String getEmail()</pre>
+</li>
+</ul>
+<a id="getUsername()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getUsername</h4>
+<pre class="methodSignature">public java.lang.String getUsername()</pre>
+</li>
+</ul>
+<a id="getFirstName()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getFirstName</h4>
+<pre class="methodSignature">public java.lang.String getFirstName()</pre>
+</li>
+</ul>
+<a id="getLastName()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getLastName</h4>
+<pre class="methodSignature">public java.lang.String getLastName()</pre>
+</li>
+</ul>
+<a id="getCallingCode()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getCallingCode</h4>
+<pre class="methodSignature">public java.lang.String getCallingCode()</pre>
+</li>
+</ul>
+<a id="getPhoneNumber()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getPhoneNumber</h4>
+<pre class="methodSignature">public java.lang.String getPhoneNumber()</pre>
+</li>
+</ul>
+<a id="getBirthDate()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getBirthDate</h4>
+<pre class="methodSignature">public java.util.Date getBirthDate()</pre>
+</li>
+</ul>
+<a id="isAdmin()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isAdmin</h4>
+<pre class="methodSignature">public boolean isAdmin()</pre>
+</li>
+</ul>
+<a id="isActive()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isActive</h4>
+<pre class="methodSignature">public boolean isActive()</pre>
+</li>
+</ul>
+<a id="setUsername(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setUsername</h4>
+<pre class="methodSignature">public void setUsername​(java.lang.String username)</pre>
+</li>
+</ul>
+<a id="setEmail(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setEmail</h4>
+<pre class="methodSignature">public void setEmail​(java.lang.String email)</pre>
+</li>
+</ul>
+<a id="setFirstName(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setFirstName</h4>
+<pre class="methodSignature">public void setFirstName​(java.lang.String firstName)</pre>
+</li>
+</ul>
+<a id="setLastName(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setLastName</h4>
+<pre class="methodSignature">public void setLastName​(java.lang.String lastName)</pre>
+</li>
+</ul>
+<a id="setCallingCode(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setCallingCode</h4>
+<pre class="methodSignature">public void setCallingCode​(java.lang.String callingCode)</pre>
+</li>
+</ul>
+<a id="setPhoneNumber(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setPhoneNumber</h4>
+<pre class="methodSignature">public void setPhoneNumber​(java.lang.String phoneNumber)</pre>
+</li>
+</ul>
+<a id="setBirthDate(java.util.Date)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setBirthDate</h4>
+<pre class="methodSignature">public void setBirthDate​(java.util.Date birthDate)</pre>
+</li>
+</ul>
+<a id="addAlbum(NTNU.IDATT1002.models.Album)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addAlbum</h4>
+<pre class="methodSignature">public void addAlbum​(<a href="Album.html" title="class in NTNU.IDATT1002.models">Album</a> album)</pre>
+<div class="block">Add given album.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>album</code> - the album to add</dd>
+</dl>
+</li>
+</ul>
+<a id="removeAlbum(NTNU.IDATT1002.models.Album)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>removeAlbum</h4>
+<pre class="methodSignature">public void removeAlbum​(<a href="Album.html" title="class in NTNU.IDATT1002.models">Album</a> album)</pre>
+<div class="block">Remove given album.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>album</code> - the album to remove</dd>
+</dl>
+</li>
+</ul>
+<a id="addImage(NTNU.IDATT1002.models.Image)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addImage</h4>
+<pre class="methodSignature">public void addImage​(<a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a> image)</pre>
+<div class="block">Add given image.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>image</code> - the image to add</dd>
+</dl>
+</li>
+</ul>
+<a id="removeAlbum(NTNU.IDATT1002.models.Image)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
-<h4>addImageAlbum</h4>
-<pre class="methodSignature">public void addImageAlbum​(<a href="ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a> imageAlbum)</pre>
+<h4>removeAlbum</h4>
+<pre class="methodSignature">public void removeAlbum​(<a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a> image)</pre>
+<div class="block">Remove given image.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>image</code> - the image to remove</dd>
+</dl>
</li>
</ul>
-<a id="removeImageAlbum(NTNU.IDATT1002.models.ImageAlbum)">
+<a id="equals(java.lang.Object)">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>removeImageAlbum</h4>
-<pre class="methodSignature">public void removeImageAlbum​(<a href="ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a> imageAlbum)</pre>
+<h4>equals</h4>
+<pre class="methodSignature">public boolean equals​(java.lang.Object o)</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>equals</code> in class <code>java.lang.Object</code></dd>
+</dl>
</li>
</ul>
</li>
diff --git a/javadoc/NTNU/IDATT1002/models/package-summary.html b/javadoc/NTNU/IDATT1002/models/package-summary.html
index 11503d076421dfa70371ff1d45d3f40c7a764e7e..e29369032cadab5e9b1ca5df5becbcca562ef147 100644
--- a/javadoc/NTNU/IDATT1002/models/package-summary.html
+++ b/javadoc/NTNU/IDATT1002/models/package-summary.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>NTNU.IDATT1002.models</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
@@ -107,16 +107,44 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</tr>
<tbody>
<tr class="altColor">
+<th class="colFirst" scope="row"><a href="Album.html" title="class in NTNU.IDATT1002.models">Album</a></th>
+<td class="colLast">
+<div class="block">Class Album representing an album.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a></th>
+<td class="colLast">
+<div class="block">Creates table Geolocation</div>
+</td>
+</tr>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a></th>
+<td class="colLast">
+<div class="block">Creates histogram table</div>
+</td>
+</tr>
+<tr class="rowColor">
<th class="colFirst" scope="row"><a href="Image.html" title="class in NTNU.IDATT1002.models">Image</a></th>
<td class="colLast"> </td>
</tr>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="Login.html" title="class in NTNU.IDATT1002.models">Login</a></th>
+<td class="colLast"> </td>
+</tr>
<tr class="rowColor">
-<th class="colFirst" scope="row"><a href="ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a></th>
+<th class="colFirst" scope="row"><a href="Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a></th>
<td class="colLast">
-<div class="block">Class ImageAlbum representing an image album.</div>
+<div class="block">Creates Metadata table</div>
</td>
</tr>
<tr class="altColor">
+<th class="colFirst" scope="row"><a href="Tag.html" title="class in NTNU.IDATT1002.models">Tag</a></th>
+<td class="colLast">
+<div class="block">Creates table named tag</div>
+</td>
+</tr>
+<tr class="rowColor">
<th class="colFirst" scope="row"><a href="User.html" title="class in NTNU.IDATT1002.models">User</a></th>
<td class="colLast"> </td>
</tr>
diff --git a/javadoc/NTNU/IDATT1002/models/package-tree.html b/javadoc/NTNU/IDATT1002/models/package-tree.html
index cfadc12c95be215b37b5d2a50c4fd3e48bd76d87..5fb5816c9c4b74abee49218070d1497181ee0a8b 100644
--- a/javadoc/NTNU/IDATT1002/models/package-tree.html
+++ b/javadoc/NTNU/IDATT1002/models/package-tree.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>NTNU.IDATT1002.models Class Hierarchy</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
@@ -106,8 +106,13 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<ul>
<li class="circle">java.lang.Object
<ul>
+<li class="circle">NTNU.IDATT1002.models.<a href="Album.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Album</span></a></li>
+<li class="circle">NTNU.IDATT1002.models.<a href="GeoLocation.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">GeoLocation</span></a></li>
+<li class="circle">NTNU.IDATT1002.models.<a href="Histogram.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Histogram</span></a></li>
<li class="circle">NTNU.IDATT1002.models.<a href="Image.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Image</span></a></li>
-<li class="circle">NTNU.IDATT1002.models.<a href="ImageAlbum.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">ImageAlbum</span></a></li>
+<li class="circle">NTNU.IDATT1002.models.<a href="Login.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Login</span></a></li>
+<li class="circle">NTNU.IDATT1002.models.<a href="Metadata.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Metadata</span></a></li>
+<li class="circle">NTNU.IDATT1002.models.<a href="Tag.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Tag</span></a></li>
<li class="circle">NTNU.IDATT1002.models.<a href="User.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">User</span></a></li>
</ul>
</li>
diff --git a/javadoc/NTNU/IDATT1002/package-summary.html b/javadoc/NTNU/IDATT1002/package-summary.html
index e178eeca54c7e844f44f6b8a4ca0dad98249312e..4d2590738c64c5ce2efd55aca2ebb775c15ec296 100644
--- a/javadoc/NTNU/IDATT1002/package-summary.html
+++ b/javadoc/NTNU/IDATT1002/package-summary.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>NTNU.IDATT1002</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../../script.js"></script>
@@ -110,6 +110,12 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<th class="colFirst" scope="row"><a href="App.html" title="class in NTNU.IDATT1002">App</a></th>
<td class="colLast"> </td>
</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="ApplicationState.html" title="class in NTNU.IDATT1002">ApplicationState</a></th>
+<td class="colLast">
+<div class="block">Class Application State.</div>
+</td>
+</tr>
</tbody>
</table>
</li>
diff --git a/javadoc/NTNU/IDATT1002/package-tree.html b/javadoc/NTNU/IDATT1002/package-tree.html
index cbe6b18736e3dcd1cb68008e21359b3f3e2cd91c..b5b011ce6770c5482a58bf8b89c253f0c9eda162 100644
--- a/javadoc/NTNU/IDATT1002/package-tree.html
+++ b/javadoc/NTNU/IDATT1002/package-tree.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>NTNU.IDATT1002 Class Hierarchy</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../../script.js"></script>
@@ -111,6 +111,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li class="circle">NTNU.IDATT1002.<a href="App.html" title="class in NTNU.IDATT1002"><span class="typeNameLink">App</span></a></li>
</ul>
</li>
+<li class="circle">NTNU.IDATT1002.<a href="ApplicationState.html" title="class in NTNU.IDATT1002"><span class="typeNameLink">ApplicationState</span></a></li>
</ul>
</li>
</ul>
diff --git a/javadoc/NTNU/IDATT1002/repository/AlbumRepository.html b/javadoc/NTNU/IDATT1002/repository/AlbumRepository.html
new file mode 100644
index 0000000000000000000000000000000000000000..86da3359091d41c22dbc09067061c5cde4a1f7f7
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/repository/AlbumRepository.html
@@ -0,0 +1,566 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>AlbumRepository</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="AlbumRepository";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.repository</a></div>
+<h2 title="Class AlbumRepository" class="title">Class AlbumRepository</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.repository.AlbumRepository</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>,​java.lang.Long></code></dd>
+</dl>
+<hr>
+<pre>public class <span class="typeNameLabel">AlbumRepository</span>
+extends java.lang.Object</pre>
+<div class="block">Album Repository.
+
+ Implementation of <code>GenericRepository</code> which supports regular Create, Read, Update and Delete operations.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>GenericRepository</code></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#ALBUM_FIND_BY_USERNAME">ALBUM_FIND_BY_USERNAME</a></span></code></th>
+<td class="colLast">
+<div class="block">Mapping to @NamedQuery 'find all albums by users username' defined in <a href="../models/Album.html" title="class in NTNU.IDATT1002.models"><code>Album</code></a></div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected javax.persistence.EntityManager</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#entityManager">entityManager</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(javax.persistence.EntityManager)">AlbumRepository</a></span>​(javax.persistence.EntityManager entityManager)</code></th>
+<td class="colLast">
+<div class="block">Constructor to inject <code>EntityManager</code> dependency and sets the class type to <a href="../models/Album.html" title="class in NTNU.IDATT1002.models"><code>Album</code></a></div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#count()">count</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Return the number of entities.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#delete(T)">delete</a></span>​(T entity)</code></th>
+<td class="colLast">
+<div class="block">Deletes the given entity.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#deleteById(ID)">deleteById</a></span>​(ID id)</code></th>
+<td class="colLast">
+<div class="block">Deletes an entity with the given id.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.util.List<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findAll()">findAll</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Retrieves all instances of the class type.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.util.List<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findAllByUsername(java.lang.String)">findAllByUsername</a></span>​(java.lang.String username)</code></th>
+<td class="colLast">
+<div class="block">Retrieves all albums of the user with the given username.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.util.Optional<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findById(ID)">findById</a></span>​(ID id)</code></th>
+<td class="colLast">
+<div class="block">Retrieves an entity with the given id.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>java.util.Optional<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#save(T)">save</a></span>​(T entity)</code></th>
+<td class="colLast">
+<div class="block">Saves a given entity and returns the saved instance.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setClassType(java.lang.Class)">setClassType</a></span>​(java.lang.Class<T> classTypeToSet)</code></th>
+<td class="colLast">
+<div class="block">Set the type of class which this class is to operate on.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="ALBUM_FIND_BY_USERNAME">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>ALBUM_FIND_BY_USERNAME</h4>
+<pre>public static final java.lang.String ALBUM_FIND_BY_USERNAME</pre>
+<div class="block">Mapping to @NamedQuery 'find all albums by users username' defined in <a href="../models/Album.html" title="class in NTNU.IDATT1002.models"><code>Album</code></a></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../constant-values.html#NTNU.IDATT1002.repository.AlbumRepository.ALBUM_FIND_BY_USERNAME">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a id="entityManager">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>entityManager</h4>
+<pre>protected javax.persistence.EntityManager entityManager</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>(javax.persistence.EntityManager)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>AlbumRepository</h4>
+<pre>public AlbumRepository​(javax.persistence.EntityManager entityManager)</pre>
+<div class="block">Constructor to inject <code>EntityManager</code> dependency and sets the class type to <a href="../models/Album.html" title="class in NTNU.IDATT1002.models"><code>Album</code></a></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entityManager</code> - the entity manager to utilize</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="findAllByUsername(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findAllByUsername</h4>
+<pre class="methodSignature">public java.util.List<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>> findAllByUsername​(java.lang.String username)</pre>
+<div class="block">Retrieves all albums of the user with the given username.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>username</code> - the username to query for</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the list of the users albums.</dd>
+</dl>
+</li>
+</ul>
+<a id="setClassType(java.lang.Class)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setClassType</h4>
+<pre class="methodSignature">public void setClassType​(java.lang.Class<T> classTypeToSet)</pre>
+<div class="block">Set the type of class which this class is to operate on.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>classTypeToSet</code> - the type of class</dd>
+</dl>
+</li>
+</ul>
+<a id="save(java.lang.Object)">
+<!-- -->
+</a><a id="save(T)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>save</h4>
+<pre class="methodSignature">public java.util.Optional<T> save​(T entity)</pre>
+<div class="block">Saves a given entity and returns the saved instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#save(T)">save</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entity</code> - not null</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the saved entity</dd>
+</dl>
+</li>
+</ul>
+<a id="findAll()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findAll</h4>
+<pre class="methodSignature">public java.util.List<T> findAll()</pre>
+<div class="block">Retrieves all instances of the class type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#findAll()">findAll</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>all entities</dd>
+</dl>
+</li>
+</ul>
+<a id="findById(java.lang.Object)">
+<!-- -->
+</a><a id="findById(ID)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findById</h4>
+<pre class="methodSignature">public java.util.Optional<T> findById​(ID id)</pre>
+<div class="block">Retrieves an entity with the given id.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#findById(ID)">findById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - not null</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the entity with the given id if found, else Optional.empty()</dd>
+</dl>
+</li>
+</ul>
+<a id="deleteById(java.lang.Object)">
+<!-- -->
+</a><a id="deleteById(ID)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>deleteById</h4>
+<pre class="methodSignature">public void deleteById​(ID id)</pre>
+<div class="block">Deletes an entity with the given id.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#deleteById(ID)">deleteById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - not null</dd>
+</dl>
+</li>
+</ul>
+<a id="delete(java.lang.Object)">
+<!-- -->
+</a><a id="delete(T)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>delete</h4>
+<pre class="methodSignature">public void delete​(T entity)</pre>
+<div class="block">Deletes the given entity.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#delete(T)">delete</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entity</code> - not null</dd>
+</dl>
+</li>
+</ul>
+<a id="count()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>count</h4>
+<pre class="methodSignature">public long count()</pre>
+<div class="block">Return the number of entities.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#count()">count</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the number of entities.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/repository/GeoLocatioRepository.html b/javadoc/NTNU/IDATT1002/repository/GeoLocatioRepository.html
new file mode 100644
index 0000000000000000000000000000000000000000..125ca649d84731e1167dfee98e22b894a954cd27
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/repository/GeoLocatioRepository.html
@@ -0,0 +1,515 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>GeoLocatioRepository</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="GeoLocatioRepository";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.repository</a></div>
+<h2 title="Class GeoLocatioRepository" class="title">Class GeoLocatioRepository</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.repository.GeoLocatioRepository</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a>,​java.lang.Long></code></dd>
+</dl>
+<hr>
+<pre>public class <span class="typeNameLabel">GeoLocatioRepository</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected javax.persistence.EntityManager</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#entityManager">entityManager</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(javax.persistence.EntityManager)">GeoLocatioRepository</a></span>​(javax.persistence.EntityManager entityManager)</code></th>
+<td class="colLast">
+<div class="block">Constructor to inject <code>EntityManager</code> dependency.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#count()">count</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Return the number of entities.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#delete(T)">delete</a></span>​(T entity)</code></th>
+<td class="colLast">
+<div class="block">Deletes the given entity.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#deleteById(ID)">deleteById</a></span>​(ID id)</code></th>
+<td class="colLast">
+<div class="block">Deletes an entity with the given id.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.util.List<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findAll()">findAll</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Retrieves all instances of the class type.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.util.Optional<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findById(ID)">findById</a></span>​(ID id)</code></th>
+<td class="colLast">
+<div class="block">Retrieves an entity with the given id.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.util.Optional<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#save(T)">save</a></span>​(T entity)</code></th>
+<td class="colLast">
+<div class="block">Saves a given entity and returns the saved instance.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setClassType(java.lang.Class)">setClassType</a></span>​(java.lang.Class<T> classTypeToSet)</code></th>
+<td class="colLast">
+<div class="block">Set the type of class which this class is to operate on.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="entityManager">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>entityManager</h4>
+<pre>protected javax.persistence.EntityManager entityManager</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>(javax.persistence.EntityManager)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>GeoLocatioRepository</h4>
+<pre>public GeoLocatioRepository​(javax.persistence.EntityManager entityManager)</pre>
+<div class="block">Constructor to inject <code>EntityManager</code> dependency.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entityManager</code> - the entity manager to utilize</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="setClassType(java.lang.Class)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setClassType</h4>
+<pre class="methodSignature">public void setClassType​(java.lang.Class<T> classTypeToSet)</pre>
+<div class="block">Set the type of class which this class is to operate on.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>classTypeToSet</code> - the type of class</dd>
+</dl>
+</li>
+</ul>
+<a id="save(java.lang.Object)">
+<!-- -->
+</a><a id="save(T)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>save</h4>
+<pre class="methodSignature">public java.util.Optional<T> save​(T entity)</pre>
+<div class="block">Saves a given entity and returns the saved instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#save(T)">save</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entity</code> - not null</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the saved entity</dd>
+</dl>
+</li>
+</ul>
+<a id="findAll()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findAll</h4>
+<pre class="methodSignature">public java.util.List<T> findAll()</pre>
+<div class="block">Retrieves all instances of the class type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#findAll()">findAll</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>all entities</dd>
+</dl>
+</li>
+</ul>
+<a id="findById(java.lang.Object)">
+<!-- -->
+</a><a id="findById(ID)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findById</h4>
+<pre class="methodSignature">public java.util.Optional<T> findById​(ID id)</pre>
+<div class="block">Retrieves an entity with the given id.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#findById(ID)">findById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - not null</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the entity with the given id if found, else Optional.empty()</dd>
+</dl>
+</li>
+</ul>
+<a id="deleteById(java.lang.Object)">
+<!-- -->
+</a><a id="deleteById(ID)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>deleteById</h4>
+<pre class="methodSignature">public void deleteById​(ID id)</pre>
+<div class="block">Deletes an entity with the given id.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#deleteById(ID)">deleteById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - not null</dd>
+</dl>
+</li>
+</ul>
+<a id="delete(java.lang.Object)">
+<!-- -->
+</a><a id="delete(T)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>delete</h4>
+<pre class="methodSignature">public void delete​(T entity)</pre>
+<div class="block">Deletes the given entity.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#delete(T)">delete</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entity</code> - not null</dd>
+</dl>
+</li>
+</ul>
+<a id="count()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>count</h4>
+<pre class="methodSignature">public long count()</pre>
+<div class="block">Return the number of entities.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#count()">count</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the number of entities.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/repository/HistorgramRepository.html b/javadoc/NTNU/IDATT1002/repository/HistorgramRepository.html
new file mode 100644
index 0000000000000000000000000000000000000000..8b9c6c8f448dc4276aed9c25d664aa819826cae4
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/repository/HistorgramRepository.html
@@ -0,0 +1,515 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>HistorgramRepository</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="HistorgramRepository";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.repository</a></div>
+<h2 title="Class HistorgramRepository" class="title">Class HistorgramRepository</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.repository.HistorgramRepository</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a>,​java.lang.Long></code></dd>
+</dl>
+<hr>
+<pre>public class <span class="typeNameLabel">HistorgramRepository</span>
+extends java.lang.Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected javax.persistence.EntityManager</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#entityManager">entityManager</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(javax.persistence.EntityManager)">HistorgramRepository</a></span>​(javax.persistence.EntityManager entityManager)</code></th>
+<td class="colLast">
+<div class="block">Constructor to inject <code>EntityManager</code> dependency.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#count()">count</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Return the number of entities.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#delete(T)">delete</a></span>​(T entity)</code></th>
+<td class="colLast">
+<div class="block">Deletes the given entity.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#deleteById(ID)">deleteById</a></span>​(ID id)</code></th>
+<td class="colLast">
+<div class="block">Deletes an entity with the given id.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.util.List<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findAll()">findAll</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Retrieves all instances of the class type.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.util.Optional<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findById(ID)">findById</a></span>​(ID id)</code></th>
+<td class="colLast">
+<div class="block">Retrieves an entity with the given id.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.util.Optional<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#save(T)">save</a></span>​(T entity)</code></th>
+<td class="colLast">
+<div class="block">Saves a given entity and returns the saved instance.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setClassType(java.lang.Class)">setClassType</a></span>​(java.lang.Class<T> classTypeToSet)</code></th>
+<td class="colLast">
+<div class="block">Set the type of class which this class is to operate on.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="entityManager">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>entityManager</h4>
+<pre>protected javax.persistence.EntityManager entityManager</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>(javax.persistence.EntityManager)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>HistorgramRepository</h4>
+<pre>public HistorgramRepository​(javax.persistence.EntityManager entityManager)</pre>
+<div class="block">Constructor to inject <code>EntityManager</code> dependency.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entityManager</code> - the entity manager to utilize</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="setClassType(java.lang.Class)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setClassType</h4>
+<pre class="methodSignature">public void setClassType​(java.lang.Class<T> classTypeToSet)</pre>
+<div class="block">Set the type of class which this class is to operate on.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>classTypeToSet</code> - the type of class</dd>
+</dl>
+</li>
+</ul>
+<a id="save(java.lang.Object)">
+<!-- -->
+</a><a id="save(T)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>save</h4>
+<pre class="methodSignature">public java.util.Optional<T> save​(T entity)</pre>
+<div class="block">Saves a given entity and returns the saved instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#save(T)">save</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entity</code> - not null</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the saved entity</dd>
+</dl>
+</li>
+</ul>
+<a id="findAll()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findAll</h4>
+<pre class="methodSignature">public java.util.List<T> findAll()</pre>
+<div class="block">Retrieves all instances of the class type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#findAll()">findAll</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>all entities</dd>
+</dl>
+</li>
+</ul>
+<a id="findById(java.lang.Object)">
+<!-- -->
+</a><a id="findById(ID)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findById</h4>
+<pre class="methodSignature">public java.util.Optional<T> findById​(ID id)</pre>
+<div class="block">Retrieves an entity with the given id.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#findById(ID)">findById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - not null</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the entity with the given id if found, else Optional.empty()</dd>
+</dl>
+</li>
+</ul>
+<a id="deleteById(java.lang.Object)">
+<!-- -->
+</a><a id="deleteById(ID)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>deleteById</h4>
+<pre class="methodSignature">public void deleteById​(ID id)</pre>
+<div class="block">Deletes an entity with the given id.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#deleteById(ID)">deleteById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - not null</dd>
+</dl>
+</li>
+</ul>
+<a id="delete(java.lang.Object)">
+<!-- -->
+</a><a id="delete(T)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>delete</h4>
+<pre class="methodSignature">public void delete​(T entity)</pre>
+<div class="block">Deletes the given entity.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#delete(T)">delete</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entity</code> - not null</dd>
+</dl>
+</li>
+</ul>
+<a id="count()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>count</h4>
+<pre class="methodSignature">public long count()</pre>
+<div class="block">Return the number of entities.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#count()">count</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the number of entities.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/repository/ImageAlbumRepository.html b/javadoc/NTNU/IDATT1002/repository/ImageAlbumRepository.html
index d5b91144b2a636bdcfe4fcc70efde724524d3c3f..a3808879da5cd101ade46cc60d0ac55a68b2033e 100644
--- a/javadoc/NTNU/IDATT1002/repository/ImageAlbumRepository.html
+++ b/javadoc/NTNU/IDATT1002/repository/ImageAlbumRepository.html
@@ -3,7 +3,7 @@
<html lang="no">
<head>
<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
-<title>ImageAlbumRepository</title>
+<title>AlbumRepository</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="dc.created" content="2020-03-19">
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
@@ -22,7 +22,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="ImageAlbumRepository";
+ parent.document.title="AlbumRepository";
}
}
catch(err) {
@@ -117,14 +117,14 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<main role="main">
<div class="header">
<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.repository</a></div>
-<h2 title="Class ImageAlbumRepository" class="title">Class ImageAlbumRepository</h2>
+<h2 title="Class AlbumRepository" class="title">Class AlbumRepository</h2>
</div>
<div class="contentContainer">
<ul class="inheritance">
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
-<li>NTNU.IDATT1002.repository.ImageAlbumRepository</li>
+<li>NTNU.IDATT1002.repository.AlbumRepository</li>
</ul>
</li>
</ul>
@@ -133,13 +133,13 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li class="blockList">
<dl>
<dt>All Implemented Interfaces:</dt>
-<dd><code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a>,​java.lang.Long></code></dd>
+<dd><code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>,​java.lang.Long></code></dd>
</dl>
<hr>
-<pre>public class <span class="typeNameLabel">ImageAlbumRepository</span>
+<pre>public class <span class="typeNameLabel">AlbumRepository</span>
extends java.lang.Object
-implements <a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a>,​java.lang.Long></pre>
-<div class="block">Image Album Repository.
+implements <a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>,​java.lang.Long></pre>
+<div class="block">Album Repository.
Implements <a href="Repository.html" title="interface in NTNU.IDATT1002.repository"><code>Repository</code></a> which supports regular Create, Read, Update and Delete operations.</div>
<dl>
@@ -170,7 +170,7 @@ implements <a href="Repository.html" title="interface in NTNU.IDATT1002.reposito
<td class="colFirst"><code>static java.lang.String</code></td>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#IMAGE_ALBUM_FIND_BY_TITLE">IMAGE_ALBUM_FIND_BY_TITLE</a></span></code></th>
<td class="colLast">
-<div class="block">Mapping to @NamedQuery 'find all image albums by title' defined in <a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models"><code>ImageAlbum</code></a></div>
+<div class="block">Mapping to @NamedQuery 'find all albums by title' defined in <a href="../models/Album.html" title="class in NTNU.IDATT1002.models"><code>Album</code></a></div>
</td>
</tr>
</table>
@@ -191,7 +191,7 @@ implements <a href="Repository.html" title="interface in NTNU.IDATT1002.reposito
<th class="colLast" scope="col">Description</th>
</tr>
<tr class="altColor">
-<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(javax.persistence.EntityManager)">ImageAlbumRepository</a></span>​(javax.persistence.EntityManager entityManager)</code></th>
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(javax.persistence.EntityManager)">AlbumRepository</a></span>​(javax.persistence.EntityManager entityManager)</code></th>
<td class="colLast"> </td>
</tr>
</table>
@@ -216,56 +216,56 @@ implements <a href="Repository.html" title="interface in NTNU.IDATT1002.reposito
<td class="colFirst"><code>long</code></td>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#count()">count</a></span>()</code></th>
<td class="colLast">
-<div class="block">Return the number of image albums.</div>
+<div class="block">Return the number of albums.</div>
</td>
</tr>
<tr id="i1" class="rowColor">
<td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#delete(NTNU.IDATT1002.models.ImageAlbum)">delete</a></span>​(<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a> imageAlbum)</code></th>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#delete(NTNU.IDATT1002.models.Album)">delete</a></span>​(<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a> album)</code></th>
<td class="colLast">
-<div class="block">Deletes the given image album.</div>
+<div class="block">Deletes the given album.</div>
</td>
</tr>
<tr id="i2" class="altColor">
<td class="colFirst"><code>void</code></td>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#deleteById(java.lang.Long)">deleteById</a></span>​(java.lang.Long id)</code></th>
<td class="colLast">
-<div class="block">Deletes an image album with the given id.</div>
+<div class="block">Deletes an album with the given id.</div>
</td>
</tr>
<tr id="i3" class="rowColor">
<td class="colFirst"><code>boolean</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#exists(NTNU.IDATT1002.models.ImageAlbum)">exists</a></span>​(<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a> imageAlbum)</code></th>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#exists(NTNU.IDATT1002.models.Album)">exists</a></span>​(<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a> album)</code></th>
<td class="colLast">
-<div class="block">Return whether the given image album exists.</div>
+<div class="block">Return whether the given album exists.</div>
</td>
</tr>
<tr id="i4" class="altColor">
<td class="colFirst"><code>java.util.List<?></code></td>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findAll()">findAll</a></span>()</code></th>
<td class="colLast">
-<div class="block">Retrieves all instances of type image album.</div>
+<div class="block">Retrieves all instances of type album.</div>
</td>
</tr>
<tr id="i5" class="rowColor">
<td class="colFirst"><code>java.util.List<?></code></td>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findAllByTitle(java.lang.String)">findAllByTitle</a></span>​(java.lang.String title)</code></th>
<td class="colLast">
-<div class="block">Retrieves all image albums with the given title.</div>
+<div class="block">Retrieves all albums with the given title.</div>
</td>
</tr>
<tr id="i6" class="altColor">
-<td class="colFirst"><code>java.util.Optional<<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a>></code></td>
+<td class="colFirst"><code>java.util.Optional<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>></code></td>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findById(java.lang.Long)">findById</a></span>​(java.lang.Long id)</code></th>
<td class="colLast">
-<div class="block">Retrieves an image album with the given id.</div>
+<div class="block">Retrieves an album with the given id.</div>
</td>
</tr>
<tr id="i7" class="rowColor">
-<td class="colFirst"><code>java.util.Optional<<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a>></code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#save(NTNU.IDATT1002.models.ImageAlbum)">save</a></span>​(<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a> imageAlbum)</code></th>
+<td class="colFirst"><code>java.util.Optional<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#save(NTNU.IDATT1002.models.Album)">save</a></span>​(<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a> album)</code></th>
<td class="colLast">
-<div class="block">Saves a given image album and returns the saved instance.</div>
+<div class="block">Saves a given album and returns the saved instance.</div>
</td>
</tr>
</table>
@@ -299,10 +299,10 @@ implements <a href="Repository.html" title="interface in NTNU.IDATT1002.reposito
<li class="blockList">
<h4>IMAGE_ALBUM_FIND_BY_TITLE</h4>
<pre>public static final java.lang.String IMAGE_ALBUM_FIND_BY_TITLE</pre>
-<div class="block">Mapping to @NamedQuery 'find all image albums by title' defined in <a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models"><code>ImageAlbum</code></a></div>
+<div class="block">Mapping to @NamedQuery 'find all albums by title' defined in <a href="../models/Album.html" title="class in NTNU.IDATT1002.models"><code>Album</code></a></div>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
-<dd><a href="../../../constant-values.html#NTNU.IDATT1002.repository.ImageAlbumRepository.IMAGE_ALBUM_FIND_BY_TITLE">Constant Field Values</a></dd>
+<dd><a href="../../../constant-values.html#NTNU.IDATT1002.repository.AlbumRepository.IMAGE_ALBUM_FIND_BY_TITLE">Constant Field Values</a></dd>
</dl>
</li>
</ul>
@@ -321,8 +321,8 @@ implements <a href="Repository.html" title="interface in NTNU.IDATT1002.reposito
</a>
<ul class="blockListLast">
<li class="blockList">
-<h4>ImageAlbumRepository</h4>
-<pre>public ImageAlbumRepository​(javax.persistence.EntityManager entityManager)</pre>
+<h4>AlbumRepository</h4>
+<pre>public AlbumRepository​(javax.persistence.EntityManager entityManager)</pre>
</li>
</ul>
</li>
@@ -335,21 +335,21 @@ implements <a href="Repository.html" title="interface in NTNU.IDATT1002.reposito
<!-- -->
</a>
<h3>Method Detail</h3>
-<a id="save(NTNU.IDATT1002.models.ImageAlbum)">
+<a id="save(NTNU.IDATT1002.models.Album)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>save</h4>
-<pre class="methodSignature">public java.util.Optional<<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a>> save​(<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a> imageAlbum)</pre>
-<div class="block">Saves a given image album and returns the saved instance.</div>
+<pre class="methodSignature">public java.util.Optional<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>> save​(<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a> album)</pre>
+<div class="block">Saves a given album and returns the saved instance.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="Repository.html#save(T)">save</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a>,​java.lang.Long></code></dd>
+<dd><code><a href="Repository.html#save(T)">save</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>,​java.lang.Long></code></dd>
<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>imageAlbum</code> - the image album to save</dd>
+<dd><code>album</code> - the album to save</dd>
<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the saved image album</dd>
+<dd>the saved album</dd>
</dl>
</li>
</ul>
@@ -360,12 +360,12 @@ implements <a href="Repository.html" title="interface in NTNU.IDATT1002.reposito
<li class="blockList">
<h4>findAll</h4>
<pre class="methodSignature">public java.util.List<?> findAll()</pre>
-<div class="block">Retrieves all instances of type image album.</div>
+<div class="block">Retrieves all instances of type album.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="Repository.html#findAll()">findAll</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a>,​java.lang.Long></code></dd>
+<dd><code><a href="Repository.html#findAll()">findAll</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>,​java.lang.Long></code></dd>
<dt><span class="returnLabel">Returns:</span></dt>
-<dd>all saved image albums</dd>
+<dd>all saved albums</dd>
</dl>
</li>
</ul>
@@ -375,13 +375,13 @@ implements <a href="Repository.html" title="interface in NTNU.IDATT1002.reposito
<ul class="blockList">
<li class="blockList">
<h4>findById</h4>
-<pre class="methodSignature">public java.util.Optional<<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a>> findById​(java.lang.Long id)</pre>
-<div class="block">Retrieves an image album with the given id.</div>
+<pre class="methodSignature">public java.util.Optional<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>> findById​(java.lang.Long id)</pre>
+<div class="block">Retrieves an album with the given id.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="Repository.html#findById(ID)">findById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a>,​java.lang.Long></code></dd>
+<dd><code><a href="Repository.html#findById(ID)">findById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>,​java.lang.Long></code></dd>
<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>id</code> - the if of the image album to find</dd>
+<dd><code>id</code> - the if of the album to find</dd>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>the entity with the given id if found, else Optional.empty()</dd>
</dl>
@@ -394,12 +394,12 @@ implements <a href="Repository.html" title="interface in NTNU.IDATT1002.reposito
<li class="blockList">
<h4>findAllByTitle</h4>
<pre class="methodSignature">public java.util.List<?> findAllByTitle​(java.lang.String title)</pre>
-<div class="block">Retrieves all image albums with the given title.</div>
+<div class="block">Retrieves all albums with the given title.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>title</code> - the image album title</dd>
+<dd><code>title</code> - the album title</dd>
<dt><span class="returnLabel">Returns:</span></dt>
-<dd>all image albums with the given title</dd>
+<dd>all albums with the given title</dd>
</dl>
</li>
</ul>
@@ -410,28 +410,28 @@ implements <a href="Repository.html" title="interface in NTNU.IDATT1002.reposito
<li class="blockList">
<h4>deleteById</h4>
<pre class="methodSignature">public void deleteById​(java.lang.Long id)</pre>
-<div class="block">Deletes an image album with the given id.</div>
+<div class="block">Deletes an album with the given id.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="Repository.html#deleteById(ID)">deleteById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a>,​java.lang.Long></code></dd>
+<dd><code><a href="Repository.html#deleteById(ID)">deleteById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>,​java.lang.Long></code></dd>
<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>id</code> - the id of the image album to delete</dd>
+<dd><code>id</code> - the id of the album to delete</dd>
</dl>
</li>
</ul>
-<a id="delete(NTNU.IDATT1002.models.ImageAlbum)">
+<a id="delete(NTNU.IDATT1002.models.Album)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>delete</h4>
-<pre class="methodSignature">public void delete​(<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a> imageAlbum)</pre>
-<div class="block">Deletes the given image album.</div>
+<pre class="methodSignature">public void delete​(<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a> album)</pre>
+<div class="block">Deletes the given album.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="Repository.html#delete(T)">delete</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a>,​java.lang.Long></code></dd>
+<dd><code><a href="Repository.html#delete(T)">delete</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>,​java.lang.Long></code></dd>
<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>imageAlbum</code> - the image album to delete</dd>
+<dd><code>album</code> - the album to delete</dd>
</dl>
</li>
</ul>
@@ -442,30 +442,30 @@ implements <a href="Repository.html" title="interface in NTNU.IDATT1002.reposito
<li class="blockList">
<h4>count</h4>
<pre class="methodSignature">public long count()</pre>
-<div class="block">Return the number of image albums.</div>
+<div class="block">Return the number of albums.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="Repository.html#count()">count</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a>,​java.lang.Long></code></dd>
+<dd><code><a href="Repository.html#count()">count</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>,​java.lang.Long></code></dd>
<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the number of image albums</dd>
+<dd>the number of albums</dd>
</dl>
</li>
</ul>
-<a id="exists(NTNU.IDATT1002.models.ImageAlbum)">
+<a id="exists(NTNU.IDATT1002.models.Album)">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>exists</h4>
-<pre class="methodSignature">public boolean exists​(<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a> imageAlbum)</pre>
-<div class="block">Return whether the given image album exists.</div>
+<pre class="methodSignature">public boolean exists​(<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a> album)</pre>
+<div class="block">Return whether the given album exists.</div>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="Repository.html#exists(T)">exists</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a>,​java.lang.Long></code></dd>
+<dd><code><a href="Repository.html#exists(T)">exists</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>,​java.lang.Long></code></dd>
<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>imageAlbum</code> - image album to check existence for</dd>
+<dd><code>album</code> - album to check existence for</dd>
<dt><span class="returnLabel">Returns:</span></dt>
-<dd>true if the image album exist, else false</dd>
+<dd>true if the album exist, else false</dd>
</dl>
</li>
</ul>
diff --git a/javadoc/NTNU/IDATT1002/repository/ImageRepository.html b/javadoc/NTNU/IDATT1002/repository/ImageRepository.html
new file mode 100644
index 0000000000000000000000000000000000000000..23569994036ccd947830b5209a53853cfad1e9e4
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/repository/ImageRepository.html
@@ -0,0 +1,566 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>ImageRepository</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="ImageRepository";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.repository</a></div>
+<h2 title="Class ImageRepository" class="title">Class ImageRepository</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.repository.ImageRepository</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>,​java.lang.Long></code></dd>
+</dl>
+<hr>
+<pre>public class <span class="typeNameLabel">ImageRepository</span>
+extends java.lang.Object</pre>
+<div class="block">Image Repository.
+ <p>
+ Implements <a href="Repository.html" title="interface in NTNU.IDATT1002.repository"><code>Repository</code></a> which supports regular Create, Read, Update and Delete operations.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="Repository.html" title="interface in NTNU.IDATT1002.repository"><code>Repository</code></a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected javax.persistence.EntityManager</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#entityManager">entityManager</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#IMAGE_FIND_BY_USERNAME">IMAGE_FIND_BY_USERNAME</a></span></code></th>
+<td class="colLast">
+<div class="block">Mapping to @NamedQuery 'find all albums by users username' defined in <a href="../models/Image.html" title="class in NTNU.IDATT1002.models"><code>Image</code></a></div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(javax.persistence.EntityManager)">ImageRepository</a></span>​(javax.persistence.EntityManager entityManager)</code></th>
+<td class="colLast">
+<div class="block">Constructor to inject <code>EntityManager</code> dependency.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#count()">count</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Return the number of entities.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#delete(T)">delete</a></span>​(T entity)</code></th>
+<td class="colLast">
+<div class="block">Deletes the given entity.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#deleteById(ID)">deleteById</a></span>​(ID id)</code></th>
+<td class="colLast">
+<div class="block">Deletes an entity with the given id.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.util.List<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findAll()">findAll</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Retrieves all instances of the class type.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.util.List<<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findAllByUsername(java.lang.String)">findAllByUsername</a></span>​(java.lang.String username)</code></th>
+<td class="colLast">
+<div class="block">Retrieves all albums of the user with the given username.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.util.Optional<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findById(ID)">findById</a></span>​(ID id)</code></th>
+<td class="colLast">
+<div class="block">Retrieves an entity with the given id.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>java.util.Optional<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#save(T)">save</a></span>​(T entity)</code></th>
+<td class="colLast">
+<div class="block">Saves a given entity and returns the saved instance.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setClassType(java.lang.Class)">setClassType</a></span>​(java.lang.Class<T> classTypeToSet)</code></th>
+<td class="colLast">
+<div class="block">Set the type of class which this class is to operate on.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="IMAGE_FIND_BY_USERNAME">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>IMAGE_FIND_BY_USERNAME</h4>
+<pre>public static final java.lang.String IMAGE_FIND_BY_USERNAME</pre>
+<div class="block">Mapping to @NamedQuery 'find all albums by users username' defined in <a href="../models/Image.html" title="class in NTNU.IDATT1002.models"><code>Image</code></a></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../constant-values.html#NTNU.IDATT1002.repository.ImageRepository.IMAGE_FIND_BY_USERNAME">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a id="entityManager">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>entityManager</h4>
+<pre>protected javax.persistence.EntityManager entityManager</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>(javax.persistence.EntityManager)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ImageRepository</h4>
+<pre>public ImageRepository​(javax.persistence.EntityManager entityManager)</pre>
+<div class="block">Constructor to inject <code>EntityManager</code> dependency.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entityManager</code> - the entity manager to utilize</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="findAllByUsername(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findAllByUsername</h4>
+<pre class="methodSignature">public java.util.List<<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>> findAllByUsername​(java.lang.String username)</pre>
+<div class="block">Retrieves all albums of the user with the given username.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>username</code> - the username to query for</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the list of the users albums.</dd>
+</dl>
+</li>
+</ul>
+<a id="setClassType(java.lang.Class)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setClassType</h4>
+<pre class="methodSignature">public void setClassType​(java.lang.Class<T> classTypeToSet)</pre>
+<div class="block">Set the type of class which this class is to operate on.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>classTypeToSet</code> - the type of class</dd>
+</dl>
+</li>
+</ul>
+<a id="save(java.lang.Object)">
+<!-- -->
+</a><a id="save(T)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>save</h4>
+<pre class="methodSignature">public java.util.Optional<T> save​(T entity)</pre>
+<div class="block">Saves a given entity and returns the saved instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#save(T)">save</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entity</code> - not null</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the saved entity</dd>
+</dl>
+</li>
+</ul>
+<a id="findAll()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findAll</h4>
+<pre class="methodSignature">public java.util.List<T> findAll()</pre>
+<div class="block">Retrieves all instances of the class type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#findAll()">findAll</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>all entities</dd>
+</dl>
+</li>
+</ul>
+<a id="findById(java.lang.Object)">
+<!-- -->
+</a><a id="findById(ID)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findById</h4>
+<pre class="methodSignature">public java.util.Optional<T> findById​(ID id)</pre>
+<div class="block">Retrieves an entity with the given id.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#findById(ID)">findById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - not null</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the entity with the given id if found, else Optional.empty()</dd>
+</dl>
+</li>
+</ul>
+<a id="deleteById(java.lang.Object)">
+<!-- -->
+</a><a id="deleteById(ID)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>deleteById</h4>
+<pre class="methodSignature">public void deleteById​(ID id)</pre>
+<div class="block">Deletes an entity with the given id.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#deleteById(ID)">deleteById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - not null</dd>
+</dl>
+</li>
+</ul>
+<a id="delete(java.lang.Object)">
+<!-- -->
+</a><a id="delete(T)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>delete</h4>
+<pre class="methodSignature">public void delete​(T entity)</pre>
+<div class="block">Deletes the given entity.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#delete(T)">delete</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entity</code> - not null</dd>
+</dl>
+</li>
+</ul>
+<a id="count()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>count</h4>
+<pre class="methodSignature">public long count()</pre>
+<div class="block">Return the number of entities.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#count()">count</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the number of entities.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/repository/LoginRepository.html b/javadoc/NTNU/IDATT1002/repository/LoginRepository.html
new file mode 100644
index 0000000000000000000000000000000000000000..f3b75dd7fdddd77dd246989edc423f56024255f1
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/repository/LoginRepository.html
@@ -0,0 +1,480 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>LoginRepository</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="LoginRepository";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.repository</a></div>
+<h2 title="Class LoginRepository" class="title">Class LoginRepository</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.repository.LoginRepository</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/Login.html" title="class in NTNU.IDATT1002.models">Login</a>,​java.lang.String></code></dd>
+</dl>
+<hr>
+<pre>public class <span class="typeNameLabel">LoginRepository</span>
+extends java.lang.Object</pre>
+<div class="block">Login Repository
+
+ Implements <a href="Repository.html" title="interface in NTNU.IDATT1002.repository"><code>Repository</code></a> whick supports CRUD operations.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="Repository.html" title="interface in NTNU.IDATT1002.repository"><code>Repository</code></a></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(javax.persistence.EntityManager)">LoginRepository</a></span>​(javax.persistence.EntityManager entityManager)</code></th>
+<td class="colLast">
+<div class="block">Constructor to inject <code>EntityManager</code> dependency and sets the class type to <a href="../models/Login.html" title="class in NTNU.IDATT1002.models"><code>Login</code></a></div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#count()">count</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Return the number of entities.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#delete(T)">delete</a></span>​(T entity)</code></th>
+<td class="colLast">
+<div class="block">Deletes the given entity.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#deleteById(ID)">deleteById</a></span>​(ID id)</code></th>
+<td class="colLast">
+<div class="block">Deletes an entity with the given id.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.util.List<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findAll()">findAll</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Retrieves all instances of the class type.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.util.Optional<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findById(ID)">findById</a></span>​(ID id)</code></th>
+<td class="colLast">
+<div class="block">Retrieves an entity with the given id.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.util.Optional<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#save(T)">save</a></span>​(T entity)</code></th>
+<td class="colLast">
+<div class="block">Saves a given entity and returns the saved instance.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setClassType(java.lang.Class)">setClassType</a></span>​(java.lang.Class<T> classTypeToSet)</code></th>
+<td class="colLast">
+<div class="block">Set the type of class which this class is to operate on.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>(javax.persistence.EntityManager)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>LoginRepository</h4>
+<pre>public LoginRepository​(javax.persistence.EntityManager entityManager)</pre>
+<div class="block">Constructor to inject <code>EntityManager</code> dependency and sets the class type to <a href="../models/Login.html" title="class in NTNU.IDATT1002.models"><code>Login</code></a></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entityManager</code> - the entity manager to utilize</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="setClassType(java.lang.Class)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setClassType</h4>
+<pre class="methodSignature">public void setClassType​(java.lang.Class<T> classTypeToSet)</pre>
+<div class="block">Set the type of class which this class is to operate on.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>classTypeToSet</code> - the type of class</dd>
+</dl>
+</li>
+</ul>
+<a id="save(java.lang.Object)">
+<!-- -->
+</a><a id="save(T)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>save</h4>
+<pre class="methodSignature">public java.util.Optional<T> save​(T entity)</pre>
+<div class="block">Saves a given entity and returns the saved instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#save(T)">save</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entity</code> - not null</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the saved entity</dd>
+</dl>
+</li>
+</ul>
+<a id="findAll()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findAll</h4>
+<pre class="methodSignature">public java.util.List<T> findAll()</pre>
+<div class="block">Retrieves all instances of the class type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#findAll()">findAll</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>all entities</dd>
+</dl>
+</li>
+</ul>
+<a id="findById(java.lang.Object)">
+<!-- -->
+</a><a id="findById(ID)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findById</h4>
+<pre class="methodSignature">public java.util.Optional<T> findById​(ID id)</pre>
+<div class="block">Retrieves an entity with the given id.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#findById(ID)">findById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - not null</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the entity with the given id if found, else Optional.empty()</dd>
+</dl>
+</li>
+</ul>
+<a id="deleteById(java.lang.Object)">
+<!-- -->
+</a><a id="deleteById(ID)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>deleteById</h4>
+<pre class="methodSignature">public void deleteById​(ID id)</pre>
+<div class="block">Deletes an entity with the given id.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#deleteById(ID)">deleteById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - not null</dd>
+</dl>
+</li>
+</ul>
+<a id="delete(java.lang.Object)">
+<!-- -->
+</a><a id="delete(T)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>delete</h4>
+<pre class="methodSignature">public void delete​(T entity)</pre>
+<div class="block">Deletes the given entity.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#delete(T)">delete</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entity</code> - not null</dd>
+</dl>
+</li>
+</ul>
+<a id="count()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>count</h4>
+<pre class="methodSignature">public long count()</pre>
+<div class="block">Return the number of entities.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#count()">count</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the number of entities.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/repository/MetadataRepository.html b/javadoc/NTNU/IDATT1002/repository/MetadataRepository.html
new file mode 100644
index 0000000000000000000000000000000000000000..82f75eee29b9c9a48af78ca851b96cece8143645
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/repository/MetadataRepository.html
@@ -0,0 +1,545 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>MetadataRepository</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="MetadataRepository";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.repository</a></div>
+<h2 title="Class MetadataRepository" class="title">Class MetadataRepository</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.repository.MetadataRepository</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a>,​java.lang.Long></code></dd>
+</dl>
+<hr>
+<pre>public class <span class="typeNameLabel">MetadataRepository</span>
+extends java.lang.Object</pre>
+<div class="block">Tag Repository.
+
+ Implementation of <code>GenericRepository</code> which supports regular Create, Read, Update and Delete operations.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>GenericRepository</code></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected javax.persistence.EntityManager</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#entityManager">entityManager</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(javax.persistence.EntityManager)">MetadataRepository</a></span>​(javax.persistence.EntityManager entityManager)</code></th>
+<td class="colLast">
+<div class="block">Constructor to inject <code>EntityManager</code> dependency and sets the class type to <a href="../models/Metadata.html" title="class in NTNU.IDATT1002.models"><code>Metadata</code></a></div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#count()">count</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Return the number of entities.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#delete(T)">delete</a></span>​(T entity)</code></th>
+<td class="colLast">
+<div class="block">Deletes the given entity.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#deleteById(ID)">deleteById</a></span>​(ID id)</code></th>
+<td class="colLast">
+<div class="block">Deletes an entity with the given id.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.util.List<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findAll()">findAll</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Retrieves all instances of the class type.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.util.Optional<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findById(ID)">findById</a></span>​(ID id)</code></th>
+<td class="colLast">
+<div class="block">Retrieves an entity with the given id.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.util.Optional<<a href="../models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findOrCreate(NTNU.IDATT1002.models.Metadata)">findOrCreate</a></span>​(<a href="../models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a> metadata)</code></th>
+<td class="colLast">
+<div class="block">Retrieves a tag if found and creates it if not.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>java.util.Optional<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#save(T)">save</a></span>​(T entity)</code></th>
+<td class="colLast">
+<div class="block">Saves a given entity and returns the saved instance.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setClassType(java.lang.Class)">setClassType</a></span>​(java.lang.Class<T> classTypeToSet)</code></th>
+<td class="colLast">
+<div class="block">Set the type of class which this class is to operate on.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="entityManager">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>entityManager</h4>
+<pre>protected javax.persistence.EntityManager entityManager</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>(javax.persistence.EntityManager)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MetadataRepository</h4>
+<pre>public MetadataRepository​(javax.persistence.EntityManager entityManager)</pre>
+<div class="block">Constructor to inject <code>EntityManager</code> dependency and sets the class type to <a href="../models/Metadata.html" title="class in NTNU.IDATT1002.models"><code>Metadata</code></a></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entityManager</code> - the entity manager to utilize</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="findOrCreate(NTNU.IDATT1002.models.Metadata)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findOrCreate</h4>
+<pre class="methodSignature">public java.util.Optional<<a href="../models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a>> findOrCreate​(<a href="../models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a> metadata)</pre>
+<div class="block">Retrieves a tag if found and creates it if not.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>metadata</code> - the tag to retrieve</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the tag if found, else the newly created one.</dd>
+</dl>
+</li>
+</ul>
+<a id="setClassType(java.lang.Class)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setClassType</h4>
+<pre class="methodSignature">public void setClassType​(java.lang.Class<T> classTypeToSet)</pre>
+<div class="block">Set the type of class which this class is to operate on.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>classTypeToSet</code> - the type of class</dd>
+</dl>
+</li>
+</ul>
+<a id="save(java.lang.Object)">
+<!-- -->
+</a><a id="save(T)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>save</h4>
+<pre class="methodSignature">public java.util.Optional<T> save​(T entity)</pre>
+<div class="block">Saves a given entity and returns the saved instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#save(T)">save</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entity</code> - not null</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the saved entity</dd>
+</dl>
+</li>
+</ul>
+<a id="findAll()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findAll</h4>
+<pre class="methodSignature">public java.util.List<T> findAll()</pre>
+<div class="block">Retrieves all instances of the class type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#findAll()">findAll</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>all entities</dd>
+</dl>
+</li>
+</ul>
+<a id="findById(java.lang.Object)">
+<!-- -->
+</a><a id="findById(ID)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findById</h4>
+<pre class="methodSignature">public java.util.Optional<T> findById​(ID id)</pre>
+<div class="block">Retrieves an entity with the given id.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#findById(ID)">findById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - not null</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the entity with the given id if found, else Optional.empty()</dd>
+</dl>
+</li>
+</ul>
+<a id="deleteById(java.lang.Object)">
+<!-- -->
+</a><a id="deleteById(ID)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>deleteById</h4>
+<pre class="methodSignature">public void deleteById​(ID id)</pre>
+<div class="block">Deletes an entity with the given id.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#deleteById(ID)">deleteById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - not null</dd>
+</dl>
+</li>
+</ul>
+<a id="delete(java.lang.Object)">
+<!-- -->
+</a><a id="delete(T)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>delete</h4>
+<pre class="methodSignature">public void delete​(T entity)</pre>
+<div class="block">Deletes the given entity.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#delete(T)">delete</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entity</code> - not null</dd>
+</dl>
+</li>
+</ul>
+<a id="count()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>count</h4>
+<pre class="methodSignature">public long count()</pre>
+<div class="block">Return the number of entities.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#count()">count</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the number of entities.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/repository/Repository.html b/javadoc/NTNU/IDATT1002/repository/Repository.html
index da13372835ddd08b6924761d01018644e67e6a78..62120b1b6c13458324efda8a358d1e7bfd4b2cfd 100644
--- a/javadoc/NTNU/IDATT1002/repository/Repository.html
+++ b/javadoc/NTNU/IDATT1002/repository/Repository.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>Repository</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
@@ -28,7 +28,7 @@
catch(err) {
}
//-->
-var data = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6};
+var data = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6};
var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -130,7 +130,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</dl>
<dl>
<dt>All Known Implementing Classes:</dt>
-<dd><code><a href="ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository">ImageAlbumRepository</a></code></dd>
+<dd><code><a href="AlbumRepository.html" title="class in NTNU.IDATT1002.repository">AlbumRepository</a></code>, <code><a href="GeoLocatioRepository.html" title="class in NTNU.IDATT1002.repository">GeoLocatioRepository</a></code>, <code><a href="HistorgramRepository.html" title="class in NTNU.IDATT1002.repository">HistorgramRepository</a></code>, <code><a href="ImageRepository.html" title="class in NTNU.IDATT1002.repository">ImageRepository</a></code>, <code><a href="LoginRepository.html" title="class in NTNU.IDATT1002.repository">LoginRepository</a></code>, <code><a href="MetadataRepository.html" title="class in NTNU.IDATT1002.repository">MetadataRepository</a></code>, <code><a href="TagRepository.html" title="class in NTNU.IDATT1002.repository">TagRepository</a></code>, <code><a href="UserRepository.html" title="class in NTNU.IDATT1002.repository">UserRepository</a></code></dd>
</dl>
<hr>
<pre>public interface <span class="typeNameLabel">Repository<T,​ID></span></pre>
@@ -177,27 +177,20 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</td>
</tr>
<tr id="i3" class="rowColor">
-<td class="colFirst"><code>boolean</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#exists(T)">exists</a></span>​(<a href="Repository.html" title="type parameter in Repository">T</a> entity)</code></th>
-<td class="colLast">
-<div class="block">Return whether the given entity exists.</div>
-</td>
-</tr>
-<tr id="i4" class="altColor">
<td class="colFirst"><code>java.util.List<?></code></td>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findAll()">findAll</a></span>()</code></th>
<td class="colLast">
<div class="block">Retrieves all instances of the type.</div>
</td>
</tr>
-<tr id="i5" class="rowColor">
+<tr id="i4" class="altColor">
<td class="colFirst"><code>java.util.Optional<<a href="Repository.html" title="type parameter in Repository">T</a>></code></td>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findById(ID)">findById</a></span>​(<a href="Repository.html" title="type parameter in Repository">ID</a> id)</code></th>
<td class="colLast">
<div class="block">Retrieves an entity with the given id.</div>
</td>
</tr>
-<tr id="i6" class="altColor">
+<tr id="i5" class="rowColor">
<td class="colFirst"><code>java.util.Optional<<a href="Repository.html" title="type parameter in Repository">T</a>></code></td>
<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#save(T)">save</a></span>​(<a href="Repository.html" title="type parameter in Repository">T</a> entity)</code></th>
<td class="colLast">
@@ -306,7 +299,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<a id="count()">
<!-- -->
</a>
-<ul class="blockList">
+<ul class="blockListLast">
<li class="blockList">
<h4>count</h4>
<pre class="methodSignature">long count()</pre>
@@ -317,24 +310,6 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</dl>
</li>
</ul>
-<a id="exists(java.lang.Object)">
-<!-- -->
-</a><a id="exists(T)">
-<!-- -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>exists</h4>
-<pre class="methodSignature">boolean exists​(<a href="Repository.html" title="type parameter in Repository">T</a> entity)</pre>
-<div class="block">Return whether the given entity exists.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>entity</code> - not null</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>true if the entity exist, else false</dd>
-</dl>
-</li>
-</ul>
</li>
</ul>
</section>
diff --git a/javadoc/NTNU/IDATT1002/repository/TagRepository.html b/javadoc/NTNU/IDATT1002/repository/TagRepository.html
new file mode 100644
index 0000000000000000000000000000000000000000..8f2d8f5edceec9794b91ab37b6630034212a64a9
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/repository/TagRepository.html
@@ -0,0 +1,545 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>TagRepository</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="TagRepository";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.repository</a></div>
+<h2 title="Class TagRepository" class="title">Class TagRepository</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.repository.TagRepository</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>,​java.lang.Long></code></dd>
+</dl>
+<hr>
+<pre>public class <span class="typeNameLabel">TagRepository</span>
+extends java.lang.Object</pre>
+<div class="block">Tag Repository.
+
+ Implementation of <code>GenericRepository</code> which supports regular Create, Read, Update and Delete operations.</div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><code>GenericRepository</code></dd>
+</dl>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected javax.persistence.EntityManager</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#entityManager">entityManager</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(javax.persistence.EntityManager)">TagRepository</a></span>​(javax.persistence.EntityManager entityManager)</code></th>
+<td class="colLast">
+<div class="block">Constructor to inject <code>EntityManager</code> dependency and sets the class type to <a href="../models/Tag.html" title="class in NTNU.IDATT1002.models"><code>Tag</code></a></div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#count()">count</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Return the number of entities.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#delete(T)">delete</a></span>​(T entity)</code></th>
+<td class="colLast">
+<div class="block">Deletes the given entity.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#deleteById(ID)">deleteById</a></span>​(ID id)</code></th>
+<td class="colLast">
+<div class="block">Deletes an entity with the given id.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.util.List<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findAll()">findAll</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Retrieves all instances of the class type.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.util.Optional<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findById(ID)">findById</a></span>​(ID id)</code></th>
+<td class="colLast">
+<div class="block">Retrieves an entity with the given id.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.util.Optional<<a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findOrCreate(NTNU.IDATT1002.models.Tag)">findOrCreate</a></span>​(<a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a> tag)</code></th>
+<td class="colLast">
+<div class="block">Retrieves a tag if found and creates it if not.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>java.util.Optional<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#save(T)">save</a></span>​(T entity)</code></th>
+<td class="colLast">
+<div class="block">Saves a given entity and returns the saved instance.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setClassType(java.lang.Class)">setClassType</a></span>​(java.lang.Class<T> classTypeToSet)</code></th>
+<td class="colLast">
+<div class="block">Set the type of class which this class is to operate on.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="entityManager">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>entityManager</h4>
+<pre>protected javax.persistence.EntityManager entityManager</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>(javax.persistence.EntityManager)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TagRepository</h4>
+<pre>public TagRepository​(javax.persistence.EntityManager entityManager)</pre>
+<div class="block">Constructor to inject <code>EntityManager</code> dependency and sets the class type to <a href="../models/Tag.html" title="class in NTNU.IDATT1002.models"><code>Tag</code></a></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entityManager</code> - the entity manager to utilize</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="findOrCreate(NTNU.IDATT1002.models.Tag)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findOrCreate</h4>
+<pre class="methodSignature">public java.util.Optional<<a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>> findOrCreate​(<a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a> tag)</pre>
+<div class="block">Retrieves a tag if found and creates it if not.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>tag</code> - the tag to retrieve</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the tag if found, else the newly created one.</dd>
+</dl>
+</li>
+</ul>
+<a id="setClassType(java.lang.Class)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setClassType</h4>
+<pre class="methodSignature">public void setClassType​(java.lang.Class<T> classTypeToSet)</pre>
+<div class="block">Set the type of class which this class is to operate on.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>classTypeToSet</code> - the type of class</dd>
+</dl>
+</li>
+</ul>
+<a id="save(java.lang.Object)">
+<!-- -->
+</a><a id="save(T)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>save</h4>
+<pre class="methodSignature">public java.util.Optional<T> save​(T entity)</pre>
+<div class="block">Saves a given entity and returns the saved instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#save(T)">save</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entity</code> - not null</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the saved entity</dd>
+</dl>
+</li>
+</ul>
+<a id="findAll()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findAll</h4>
+<pre class="methodSignature">public java.util.List<T> findAll()</pre>
+<div class="block">Retrieves all instances of the class type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#findAll()">findAll</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>all entities</dd>
+</dl>
+</li>
+</ul>
+<a id="findById(java.lang.Object)">
+<!-- -->
+</a><a id="findById(ID)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findById</h4>
+<pre class="methodSignature">public java.util.Optional<T> findById​(ID id)</pre>
+<div class="block">Retrieves an entity with the given id.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#findById(ID)">findById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - not null</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the entity with the given id if found, else Optional.empty()</dd>
+</dl>
+</li>
+</ul>
+<a id="deleteById(java.lang.Object)">
+<!-- -->
+</a><a id="deleteById(ID)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>deleteById</h4>
+<pre class="methodSignature">public void deleteById​(ID id)</pre>
+<div class="block">Deletes an entity with the given id.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#deleteById(ID)">deleteById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - not null</dd>
+</dl>
+</li>
+</ul>
+<a id="delete(java.lang.Object)">
+<!-- -->
+</a><a id="delete(T)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>delete</h4>
+<pre class="methodSignature">public void delete​(T entity)</pre>
+<div class="block">Deletes the given entity.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#delete(T)">delete</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entity</code> - not null</dd>
+</dl>
+</li>
+</ul>
+<a id="count()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>count</h4>
+<pre class="methodSignature">public long count()</pre>
+<div class="block">Return the number of entities.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#count()">count</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the number of entities.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/repository/UserRepository.html b/javadoc/NTNU/IDATT1002/repository/UserRepository.html
new file mode 100644
index 0000000000000000000000000000000000000000..349a725d78de7f7cadb7f36cf3c3605519173f72
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/repository/UserRepository.html
@@ -0,0 +1,517 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>UserRepository</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="UserRepository";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.repository</a></div>
+<h2 title="Class UserRepository" class="title">Class UserRepository</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.repository.UserRepository</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="../models/User.html" title="class in NTNU.IDATT1002.models">User</a>,​java.lang.String></code></dd>
+</dl>
+<hr>
+<pre>public class <span class="typeNameLabel">UserRepository</span>
+extends java.lang.Object</pre>
+<div class="block">User Repository.
+ Implementation of <code>GenericRepository</code> which supports regular Create, Read, Update and Delete operations.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!-- -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>protected javax.persistence.EntityManager</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#entityManager">entityManager</a></span></code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(javax.persistence.EntityManager)">UserRepository</a></span>​(javax.persistence.EntityManager entityManager)</code></th>
+<td class="colLast">
+<div class="block">Constructor to inject <code>EntityManager</code> dependency and sets the class type to <a href="../models/User.html" title="class in NTNU.IDATT1002.models"><code>User</code></a></div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>long</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#count()">count</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Return the number of entities.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#delete(T)">delete</a></span>​(T entity)</code></th>
+<td class="colLast">
+<div class="block">Deletes the given entity.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#deleteById(ID)">deleteById</a></span>​(ID id)</code></th>
+<td class="colLast">
+<div class="block">Deletes an entity with the given id.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.util.List<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findAll()">findAll</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Retrieves all instances of the class type.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.util.Optional<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findById(ID)">findById</a></span>​(ID id)</code></th>
+<td class="colLast">
+<div class="block">Retrieves an entity with the given id.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.util.Optional<T></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#save(T)">save</a></span>​(T entity)</code></th>
+<td class="colLast">
+<div class="block">Saves a given entity and returns the saved instance.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setClassType(java.lang.Class)">setClassType</a></span>​(java.lang.Class<T> classTypeToSet)</code></th>
+<td class="colLast">
+<div class="block">Set the type of class which this class is to operate on.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!-- -->
+</a>
+<h3>Field Detail</h3>
+<a id="entityManager">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>entityManager</h4>
+<pre>protected javax.persistence.EntityManager entityManager</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>(javax.persistence.EntityManager)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>UserRepository</h4>
+<pre>public UserRepository​(javax.persistence.EntityManager entityManager)</pre>
+<div class="block">Constructor to inject <code>EntityManager</code> dependency and sets the class type to <a href="../models/User.html" title="class in NTNU.IDATT1002.models"><code>User</code></a></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entityManager</code> - the entity manager to utilize</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="setClassType(java.lang.Class)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setClassType</h4>
+<pre class="methodSignature">public void setClassType​(java.lang.Class<T> classTypeToSet)</pre>
+<div class="block">Set the type of class which this class is to operate on.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>classTypeToSet</code> - the type of class</dd>
+</dl>
+</li>
+</ul>
+<a id="save(java.lang.Object)">
+<!-- -->
+</a><a id="save(T)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>save</h4>
+<pre class="methodSignature">public java.util.Optional<T> save​(T entity)</pre>
+<div class="block">Saves a given entity and returns the saved instance.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#save(T)">save</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entity</code> - not null</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the saved entity</dd>
+</dl>
+</li>
+</ul>
+<a id="findAll()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findAll</h4>
+<pre class="methodSignature">public java.util.List<T> findAll()</pre>
+<div class="block">Retrieves all instances of the class type.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#findAll()">findAll</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>all entities</dd>
+</dl>
+</li>
+</ul>
+<a id="findById(java.lang.Object)">
+<!-- -->
+</a><a id="findById(ID)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findById</h4>
+<pre class="methodSignature">public java.util.Optional<T> findById​(ID id)</pre>
+<div class="block">Retrieves an entity with the given id.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#findById(ID)">findById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - not null</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the entity with the given id if found, else Optional.empty()</dd>
+</dl>
+</li>
+</ul>
+<a id="deleteById(java.lang.Object)">
+<!-- -->
+</a><a id="deleteById(ID)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>deleteById</h4>
+<pre class="methodSignature">public void deleteById​(ID id)</pre>
+<div class="block">Deletes an entity with the given id.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#deleteById(ID)">deleteById</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>id</code> - not null</dd>
+</dl>
+</li>
+</ul>
+<a id="delete(java.lang.Object)">
+<!-- -->
+</a><a id="delete(T)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>delete</h4>
+<pre class="methodSignature">public void delete​(T entity)</pre>
+<div class="block">Deletes the given entity.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#delete(T)">delete</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>entity</code> - not null</dd>
+</dl>
+</li>
+</ul>
+<a id="count()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>count</h4>
+<pre class="methodSignature">public long count()</pre>
+<div class="block">Return the number of entities.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="Repository.html#count()">count</a></code> in interface <code><a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID></code></dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the number of entities.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field.summary">Field</a> | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li><a href="#field.detail">Field</a> | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/repository/package-summary.html b/javadoc/NTNU/IDATT1002/repository/package-summary.html
index d3520277eeffbc1700300bb95a33da0a00d67815..25b574a96be5fa391474eece0bc4c8d4621028e0 100644
--- a/javadoc/NTNU/IDATT1002/repository/package-summary.html
+++ b/javadoc/NTNU/IDATT1002/repository/package-summary.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>NTNU.IDATT1002.repository</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
@@ -124,9 +124,49 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</tr>
<tbody>
<tr class="altColor">
-<th class="colFirst" scope="row"><a href="ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository">ImageAlbumRepository</a></th>
+<th class="colFirst" scope="row"><a href="AlbumRepository.html" title="class in NTNU.IDATT1002.repository">AlbumRepository</a></th>
<td class="colLast">
-<div class="block">Image Album Repository.</div>
+<div class="block">Album Repository.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="GeoLocatioRepository.html" title="class in NTNU.IDATT1002.repository">GeoLocatioRepository</a></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="HistorgramRepository.html" title="class in NTNU.IDATT1002.repository">HistorgramRepository</a></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="ImageRepository.html" title="class in NTNU.IDATT1002.repository">ImageRepository</a></th>
+<td class="colLast">
+<div class="block">Image Repository.</div>
+</td>
+</tr>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="LoginRepository.html" title="class in NTNU.IDATT1002.repository">LoginRepository</a></th>
+<td class="colLast">
+<div class="block">Login Repository
+
+ Implements <a href="Repository.html" title="interface in NTNU.IDATT1002.repository"><code>Repository</code></a> whick supports CRUD operations.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="MetadataRepository.html" title="class in NTNU.IDATT1002.repository">MetadataRepository</a></th>
+<td class="colLast">
+<div class="block">Tag Repository.</div>
+</td>
+</tr>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="TagRepository.html" title="class in NTNU.IDATT1002.repository">TagRepository</a></th>
+<td class="colLast">
+<div class="block">Tag Repository.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="UserRepository.html" title="class in NTNU.IDATT1002.repository">UserRepository</a></th>
+<td class="colLast">
+<div class="block">User Repository.</div>
</td>
</tr>
</tbody>
diff --git a/javadoc/NTNU/IDATT1002/repository/package-tree.html b/javadoc/NTNU/IDATT1002/repository/package-tree.html
index bc04172463534a0889112885376080d70daaa837..ce4a22b2c6ade9e713003d41754ecc6e427319e2 100644
--- a/javadoc/NTNU/IDATT1002/repository/package-tree.html
+++ b/javadoc/NTNU/IDATT1002/repository/package-tree.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>NTNU.IDATT1002.repository Class Hierarchy</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
@@ -106,7 +106,14 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<ul>
<li class="circle">java.lang.Object
<ul>
-<li class="circle">NTNU.IDATT1002.repository.<a href="ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">ImageAlbumRepository</span></a> (implements NTNU.IDATT1002.repository.<a href="Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID>)</li>
+<li class="circle">NTNU.IDATT1002.repository.<a href="AlbumRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">AlbumRepository</span></a></li>
+<li class="circle">NTNU.IDATT1002.repository.<a href="GeoLocatioRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">GeoLocatioRepository</span></a></li>
+<li class="circle">NTNU.IDATT1002.repository.<a href="HistorgramRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">HistorgramRepository</span></a></li>
+<li class="circle">NTNU.IDATT1002.repository.<a href="ImageRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">ImageRepository</span></a></li>
+<li class="circle">NTNU.IDATT1002.repository.<a href="LoginRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">LoginRepository</span></a></li>
+<li class="circle">NTNU.IDATT1002.repository.<a href="MetadataRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">MetadataRepository</span></a></li>
+<li class="circle">NTNU.IDATT1002.repository.<a href="TagRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">TagRepository</span></a></li>
+<li class="circle">NTNU.IDATT1002.repository.<a href="UserRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">UserRepository</span></a></li>
</ul>
</li>
</ul>
diff --git a/javadoc/NTNU/IDATT1002/service/AlbumDocument.html b/javadoc/NTNU/IDATT1002/service/AlbumDocument.html
new file mode 100644
index 0000000000000000000000000000000000000000..e92a6202c5f78da705a7e87190026effb6936137
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/service/AlbumDocument.html
@@ -0,0 +1,268 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>AlbumDocument</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="AlbumDocument";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":6,"i1":6};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li>Constr | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li>Constr | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.service</a></div>
+<h2 title="Interface AlbumDocument" class="title">Interface AlbumDocument</h2>
+</div>
+<div class="contentContainer">
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Known Implementing Classes:</dt>
+<dd><code><a href="PdfDocument.html" title="class in NTNU.IDATT1002.service">PdfDocument</a></code></dd>
+</dl>
+<hr>
+<pre>public interface <span class="typeNameLabel">AlbumDocument</span></pre>
+<div class="block">Album Document Interface. Defines operations for getting and creating documents.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t3" class="tableTab"><span><a href="javascript:show(4);">Abstract Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createDocument()">createDocument</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.io.File</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getDocument()">getDocument</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="getDocument()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDocument</h4>
+<pre class="methodSignature">java.io.File getDocument()</pre>
+</li>
+</ul>
+<a id="createDocument()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>createDocument</h4>
+<pre class="methodSignature">void createDocument()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li>Constr | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li>Constr | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/service/AlbumService.html b/javadoc/NTNU/IDATT1002/service/AlbumService.html
new file mode 100644
index 0000000000000000000000000000000000000000..fa9783ed7d8b626405937eafb3d621233b88c5d2
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/service/AlbumService.html
@@ -0,0 +1,516 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>AlbumService</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="AlbumService";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.service</a></div>
+<h2 title="Class AlbumService" class="title">Class AlbumService</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.service.AlbumService</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">AlbumService</span>
+extends java.lang.Object</pre>
+<div class="block">Album Service. Supports common domain specific operations such as creating an album,
+ adding images and tags as well as searching by an arbitrary query.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(javax.persistence.EntityManager)">AlbumService</a></span>​(javax.persistence.EntityManager entityManager)</code></th>
+<td class="colLast">
+<div class="block">Inject entity manager instance to the repositories.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.util.Optional<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addImageToAlbum(NTNU.IDATT1002.models.Album,NTNU.IDATT1002.models.Image)">addImageToAlbum</a></span>​(<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a> album,
+ <a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a> image)</code></th>
+<td class="colLast">
+<div class="block">Add given image to the given album.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.util.Optional<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addTagToAlbum(NTNU.IDATT1002.models.Album,NTNU.IDATT1002.models.Tag)">addTagToAlbum</a></span>​(<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a> album,
+ <a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a> tag)</code></th>
+<td class="colLast">
+<div class="block">Adds the given tag to the given album.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>java.util.Optional<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createAlbum(java.lang.String,java.lang.String,NTNU.IDATT1002.models.User,java.lang.String)">createAlbum</a></span>​(java.lang.String title,
+ java.lang.String description,
+ <a href="../models/User.html" title="class in NTNU.IDATT1002.models">User</a> user,
+ java.lang.String tagsAsString)</code></th>
+<td class="colLast">
+<div class="block">Retrieves all albums created by the given user by username.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.util.Optional<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createAlbum(java.lang.String,java.lang.String,NTNU.IDATT1002.models.User,java.util.List,java.util.List)">createAlbum</a></span>​(java.lang.String title,
+ java.lang.String description,
+ <a href="../models/User.html" title="class in NTNU.IDATT1002.models">User</a> user,
+ java.util.List<<a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>> tags,
+ java.util.List<<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>> images)</code></th>
+<td class="colLast">
+<div class="block">Create a new album with all fields populated.</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.util.Optional<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAlbumById(java.lang.Long)">getAlbumById</a></span>​(java.lang.Long albumId)</code></th>
+<td class="colLast"> </td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>java.util.List<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAlbumFromUser(NTNU.IDATT1002.models.User)">getAlbumFromUser</a></span>​(<a href="../models/User.html" title="class in NTNU.IDATT1002.models">User</a> user)</code></th>
+<td class="colLast">
+<div class="block">Retrieves all albums created by the given user by username.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>java.util.List<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAllAlbums()">getAllAlbums</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Retrieves all albums.</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code><a href="AlbumDocument.html" title="interface in NTNU.IDATT1002.service">AlbumDocument</a></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getDocument(java.lang.Long)">getDocument</a></span>​(java.lang.Long albumId)</code></th>
+<td class="colLast">
+<div class="block">Create and return a new document for the album with the given id.</div>
+</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>java.util.List<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#searchAlbums(java.lang.String)">searchAlbums</a></span>​(java.lang.String query)</code></th>
+<td class="colLast">
+<div class="block">Search all images by title, description and tags specified in <a href="../filters/AlbumFilter.html#filter(java.lang.String)"><code>AlbumFilter.filter(String)</code></a>.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>(javax.persistence.EntityManager)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>AlbumService</h4>
+<pre>public AlbumService​(javax.persistence.EntityManager entityManager)</pre>
+<div class="block">Inject entity manager instance to the repositories.</div>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="getAlbumById(java.lang.Long)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAlbumById</h4>
+<pre class="methodSignature">public java.util.Optional<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>> getAlbumById​(java.lang.Long albumId)</pre>
+</li>
+</ul>
+<a id="getAllAlbums()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAllAlbums</h4>
+<pre class="methodSignature">public java.util.List<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>> getAllAlbums()</pre>
+<div class="block">Retrieves all albums.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>list of all albums.</dd>
+</dl>
+</li>
+</ul>
+<a id="createAlbum(java.lang.String,java.lang.String,NTNU.IDATT1002.models.User,java.util.List,java.util.List)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createAlbum</h4>
+<pre class="methodSignature">public java.util.Optional<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>> createAlbum​(java.lang.String title,
+ java.lang.String description,
+ <a href="../models/User.html" title="class in NTNU.IDATT1002.models">User</a> user,
+ java.util.List<<a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>> tags,
+ java.util.List<<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>> images)</pre>
+<div class="block">Create a new album with all fields populated.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>title</code> - the title of the album</dd>
+<dd><code>description</code> - the description of the album</dd>
+<dd><code>user</code> - the user of the album</dd>
+<dd><code>tags</code> - the tags of the album</dd>
+<dd><code>images</code> - the images of the album</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Optional containing the saved album</dd>
+</dl>
+</li>
+</ul>
+<a id="createAlbum(java.lang.String,java.lang.String,NTNU.IDATT1002.models.User,java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createAlbum</h4>
+<pre class="methodSignature">public java.util.Optional<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>> createAlbum​(java.lang.String title,
+ java.lang.String description,
+ <a href="../models/User.html" title="class in NTNU.IDATT1002.models">User</a> user,
+ java.lang.String tagsAsString)</pre>
+<div class="block">Retrieves all albums created by the given user by username.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>title</code> - the title of the album</dd>
+<dd><code>description</code> - the description of the album</dd>
+<dd><code>user</code> - the user of the album</dd>
+<dd><code>tagsAsString</code> - the tags of the album as strings</dd>
+</dl>
+</li>
+</ul>
+<a id="getDocument(java.lang.Long)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDocument</h4>
+<pre class="methodSignature">public <a href="AlbumDocument.html" title="interface in NTNU.IDATT1002.service">AlbumDocument</a> getDocument​(java.lang.Long albumId)</pre>
+<div class="block">Create and return a new document for the album with the given id.
+ The document is saved to the users dowloads folder.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>albumId</code> - the album id to get a document for</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the document created</dd>
+</dl>
+</li>
+</ul>
+<a id="getAlbumFromUser(NTNU.IDATT1002.models.User)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAlbumFromUser</h4>
+<pre class="methodSignature">public java.util.List<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>> getAlbumFromUser​(<a href="../models/User.html" title="class in NTNU.IDATT1002.models">User</a> user)</pre>
+<div class="block">Retrieves all albums created by the given user by username.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>user</code> - the user to query by</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>list of all albums created by the user</dd>
+</dl>
+</li>
+</ul>
+<a id="addTagToAlbum(NTNU.IDATT1002.models.Album,NTNU.IDATT1002.models.Tag)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addTagToAlbum</h4>
+<pre class="methodSignature">public java.util.Optional<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>> addTagToAlbum​(<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a> album,
+ <a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a> tag)</pre>
+<div class="block">Adds the given tag to the given album.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>album</code> - the album to add the tag to</dd>
+<dd><code>tag</code> - the tag to add</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the updated album</dd>
+</dl>
+</li>
+</ul>
+<a id="addImageToAlbum(NTNU.IDATT1002.models.Album,NTNU.IDATT1002.models.Image)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addImageToAlbum</h4>
+<pre class="methodSignature">public java.util.Optional<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>> addImageToAlbum​(<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a> album,
+ <a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a> image)</pre>
+<div class="block">Add given image to the given album.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>album</code> - the album to add the image to</dd>
+<dd><code>image</code> - the image to add</dd>
+</dl>
+</li>
+</ul>
+<a id="searchAlbums(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>searchAlbums</h4>
+<pre class="methodSignature">public java.util.List<<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a>> searchAlbums​(java.lang.String query)</pre>
+<div class="block">Search all images by title, description and tags specified in <a href="../filters/AlbumFilter.html#filter(java.lang.String)"><code>AlbumFilter.filter(String)</code></a>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>query</code> - the query to filter by</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>list of albums matching the query</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/service/ImageService.html b/javadoc/NTNU/IDATT1002/service/ImageService.html
new file mode 100644
index 0000000000000000000000000000000000000000..3e0f3a0b839d00d6a28f87a62d8f3299630c1813
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/service/ImageService.html
@@ -0,0 +1,416 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>ImageService</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="ImageService";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.service</a></div>
+<h2 title="Class ImageService" class="title">Class ImageService</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.service.ImageService</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">ImageService</span>
+extends java.lang.Object</pre>
+<div class="block">Image service</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(javax.persistence.EntityManager)">ImageService</a></span>​(javax.persistence.EntityManager entityManager)</code></th>
+<td class="colLast">
+<div class="block">Inject entity manager instance to the repositories.</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.util.Optional<<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addTagToImage(NTNU.IDATT1002.models.Image,NTNU.IDATT1002.models.Tag)">addTagToImage</a></span>​(<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a> image,
+ <a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a> tag)</code></th>
+<td class="colLast">
+<div class="block">Adds the given tag to the given album.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.util.Optional<<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createImage(NTNU.IDATT1002.models.User,java.io.File,java.util.ArrayList)">createImage</a></span>​(<a href="../models/User.html" title="class in NTNU.IDATT1002.models">User</a> user,
+ java.io.File file,
+ java.util.ArrayList<<a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>> tags)</code></th>
+<td class="colLast">
+<div class="block">Creates a new image from the input File</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>java.util.List<<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAllImages()">getAllImages</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Retrieves all images.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>java.util.List<<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getImageFromUser(NTNU.IDATT1002.models.User)">getImageFromUser</a></span>​(<a href="../models/User.html" title="class in NTNU.IDATT1002.models">User</a> user)</code></th>
+<td class="colLast">
+<div class="block">Finds each picture belonging to a specific user</div>
+</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>java.util.List<<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#searchImages(java.lang.String)">searchImages</a></span>​(java.lang.String query)</code></th>
+<td class="colLast">
+<div class="block">Search all images by tags specified in <a href="../filters/ImageFilter.html#filter(java.lang.String)"><code>ImageFilter.filter(String)</code></a>.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>(javax.persistence.EntityManager)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ImageService</h4>
+<pre>public ImageService​(javax.persistence.EntityManager entityManager)</pre>
+<div class="block">Inject entity manager instance to the repositories.</div>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="createImage(NTNU.IDATT1002.models.User,java.io.File,java.util.ArrayList)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createImage</h4>
+<pre class="methodSignature">public java.util.Optional<<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>> createImage​(<a href="../models/User.html" title="class in NTNU.IDATT1002.models">User</a> user,
+ java.io.File file,
+ java.util.ArrayList<<a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>> tags)</pre>
+<div class="block">Creates a new image from the input File</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>user</code> - the user of the image</dd>
+<dd><code>file</code> - the file uploaded</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Optional containing the saved image</dd>
+</dl>
+</li>
+</ul>
+<a id="getImageFromUser(NTNU.IDATT1002.models.User)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getImageFromUser</h4>
+<pre class="methodSignature">public java.util.List<<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>> getImageFromUser​(<a href="../models/User.html" title="class in NTNU.IDATT1002.models">User</a> user)</pre>
+<div class="block">Finds each picture belonging to a specific user</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>user</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>a list with all pictures from a user</dd>
+</dl>
+</li>
+</ul>
+<a id="getAllImages()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAllImages</h4>
+<pre class="methodSignature">public java.util.List<<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>> getAllImages()</pre>
+<div class="block">Retrieves all images.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>list of all images.</dd>
+</dl>
+</li>
+</ul>
+<a id="addTagToImage(NTNU.IDATT1002.models.Image,NTNU.IDATT1002.models.Tag)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addTagToImage</h4>
+<pre class="methodSignature">public java.util.Optional<<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>> addTagToImage​(<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a> image,
+ <a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a> tag)</pre>
+<div class="block">Adds the given tag to the given album.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>image</code> - the album to add the tag to</dd>
+<dd><code>tag</code> - the tag to add</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the updated album</dd>
+</dl>
+</li>
+</ul>
+<a id="searchImages(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>searchImages</h4>
+<pre class="methodSignature">public java.util.List<<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a>> searchImages​(java.lang.String query)</pre>
+<div class="block">Search all images by tags specified in <a href="../filters/ImageFilter.html#filter(java.lang.String)"><code>ImageFilter.filter(String)</code></a>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>query</code> - the query to filter by</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>list of images matching the query</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/service/PdfDocument.html b/javadoc/NTNU/IDATT1002/service/PdfDocument.html
new file mode 100644
index 0000000000000000000000000000000000000000..1732c9ccb86656dc17b14f360d1959adcdd2a54c
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/service/PdfDocument.html
@@ -0,0 +1,338 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>PdfDocument</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="PdfDocument";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.service</a></div>
+<h2 title="Class PdfDocument" class="title">Class PdfDocument</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.service.PdfDocument</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>All Implemented Interfaces:</dt>
+<dd><code><a href="AlbumDocument.html" title="interface in NTNU.IDATT1002.service">AlbumDocument</a></code></dd>
+</dl>
+<hr>
+<pre>public class <span class="typeNameLabel">PdfDocument</span>
+extends java.lang.Object
+implements <a href="AlbumDocument.html" title="interface in NTNU.IDATT1002.service">AlbumDocument</a></pre>
+<div class="block">Class PdfDocument. Generates a pdf document displaying a given album.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(NTNU.IDATT1002.models.Album,java.lang.String)">PdfDocument</a></span>​(<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a> album,
+ java.lang.String DESTINATION_FILE)</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createDocument()">createDocument</a></span>()</code></th>
+<td class="colLast">
+<div class="block">Create a new pdf document.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>java.io.File</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getDocument()">getDocument</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>(NTNU.IDATT1002.models.Album,java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>PdfDocument</h4>
+<pre>public PdfDocument​(<a href="../models/Album.html" title="class in NTNU.IDATT1002.models">Album</a> album,
+ java.lang.String DESTINATION_FILE)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="getDocument()">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDocument</h4>
+<pre class="methodSignature">public java.io.File getDocument()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="AlbumDocument.html#getDocument()">getDocument</a></code> in interface <code><a href="AlbumDocument.html" title="interface in NTNU.IDATT1002.service">AlbumDocument</a></code></dd>
+</dl>
+</li>
+</ul>
+<a id="createDocument()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>createDocument</h4>
+<pre class="methodSignature">public void createDocument()</pre>
+<div class="block">Create a new pdf document.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="AlbumDocument.html#createDocument()">createDocument</a></code> in interface <code><a href="AlbumDocument.html" title="interface in NTNU.IDATT1002.service">AlbumDocument</a></code></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/service/TagService.html b/javadoc/NTNU/IDATT1002/service/TagService.html
new file mode 100644
index 0000000000000000000000000000000000000000..b790cce374d6ce030a9f20852295298858715c61
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/service/TagService.html
@@ -0,0 +1,337 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>TagService</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="TagService";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.service</a></div>
+<h2 title="Class TagService" class="title">Class TagService</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.service.TagService</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">TagService</span>
+extends java.lang.Object</pre>
+<div class="block">Tag Service. Supports common domain specific operations such as converting a list of tags to a string
+ and opposite.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">TagService</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getTagsAsString(java.util.List)">getTagsAsString</a></span>​(java.util.List<<a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>> tags)</code></th>
+<td class="colLast">
+<div class="block">Retrieves tags from list of tags and converts them to a concatenated string.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static java.util.List<<a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getTagsFromString(java.lang.String)">getTagsFromString</a></span>​(java.lang.String tagsAsString)</code></th>
+<td class="colLast">
+<div class="block">Retrieves tags from text field and converts them to a list of tag objects.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>TagService</h4>
+<pre>public TagService()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="getTagsFromString(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTagsFromString</h4>
+<pre class="methodSignature">public static java.util.List<<a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>> getTagsFromString​(java.lang.String tagsAsString)</pre>
+<div class="block">Retrieves tags from text field and converts them to a list of tag objects.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the list of tag objects</dd>
+</dl>
+</li>
+</ul>
+<a id="getTagsAsString(java.util.List)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getTagsAsString</h4>
+<pre class="methodSignature">public static java.lang.String getTagsAsString​(java.util.List<<a href="../models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a>> tags)</pre>
+<div class="block">Retrieves tags from list of tags and converts them to a concatenated string.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>tags</code> - the list of tags</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the tags as a string</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/service/UserService.html b/javadoc/NTNU/IDATT1002/service/UserService.html
new file mode 100644
index 0000000000000000000000000000000000000000..98cbd75b814516290b2730303c642a9a1f56291d
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/service/UserService.html
@@ -0,0 +1,364 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>UserService</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="UserService";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.service</a></div>
+<h2 title="Class UserService" class="title">Class UserService</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.service.UserService</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">UserService</span>
+extends java.lang.Object</pre>
+<div class="block">User Service</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E(javax.persistence.EntityManager)">UserService</a></span>​(javax.persistence.EntityManager entityManager)</code></th>
+<td class="colLast">
+<div class="block">Inject entity manager instance to the repositories</div>
+</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>java.util.Optional<<a href="../models/User.html" title="class in NTNU.IDATT1002.models">User</a>></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createUser(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.util.Date,java.lang.String)">createUser</a></span>​(java.lang.String email,
+ java.lang.String username,
+ java.lang.String firstName,
+ java.lang.String lastName,
+ java.lang.String callingCode,
+ java.lang.String phoneNumber,
+ java.util.Date birthDate,
+ java.lang.String password)</code></th>
+<td class="colLast">
+<div class="block">Creates a new user and sets password on the new user</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>boolean</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#logIn(java.lang.String,java.lang.String)">logIn</a></span>​(java.lang.String username,
+ java.lang.String password)</code></th>
+<td class="colLast">
+<div class="block">Logs a user in if correct credentials is given</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>(javax.persistence.EntityManager)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>UserService</h4>
+<pre>public UserService​(javax.persistence.EntityManager entityManager)</pre>
+<div class="block">Inject entity manager instance to the repositories</div>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="createUser(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.util.Date,java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createUser</h4>
+<pre class="methodSignature">public java.util.Optional<<a href="../models/User.html" title="class in NTNU.IDATT1002.models">User</a>> createUser​(java.lang.String email,
+ java.lang.String username,
+ java.lang.String firstName,
+ java.lang.String lastName,
+ java.lang.String callingCode,
+ java.lang.String phoneNumber,
+ java.util.Date birthDate,
+ java.lang.String password)</pre>
+<div class="block">Creates a new user and sets password on the new user</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>email</code> - that will added to the user</dd>
+<dd><code>username</code> - that will be registered to the user</dd>
+<dd><code>firstName</code> - of the user</dd>
+<dd><code>lastName</code> - of the user</dd>
+<dd><code>callingCode</code> - of the phone number</dd>
+<dd><code>phoneNumber</code> - of the user</dd>
+<dd><code>birthDate</code> - of the user</dd>
+<dd><code>password</code> - that will be set to login</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Optional with the user</dd>
+</dl>
+</li>
+</ul>
+<a id="logIn(java.lang.String,java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>logIn</h4>
+<pre class="methodSignature">public boolean logIn​(java.lang.String username,
+ java.lang.String password)</pre>
+<div class="block">Logs a user in if correct credentials is given</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>username</code> - that will be checked against</dd>
+<dd><code>password</code> - that will be compared to database</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/service/package-summary.html b/javadoc/NTNU/IDATT1002/service/package-summary.html
new file mode 100644
index 0000000000000000000000000000000000000000..454c59042812582bdbeda9dda35af8d473dbf784
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/service/package-summary.html
@@ -0,0 +1,208 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>NTNU.IDATT1002.service</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="NTNU.IDATT1002.service";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="header">
+<h1 title="Package" class="title">Package NTNU.IDATT1002.service</h1>
+</div>
+<div class="contentContainer">
+<ul class="blockList">
+<li class="blockList">
+<table class="typeSummary">
+<caption><span>Interface Summary</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Interface</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="AlbumDocument.html" title="interface in NTNU.IDATT1002.service">AlbumDocument</a></th>
+<td class="colLast">
+<div class="block">Album Document Interface.</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="typeSummary">
+<caption><span>Class Summary</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="AlbumService.html" title="class in NTNU.IDATT1002.service">AlbumService</a></th>
+<td class="colLast">
+<div class="block">Album Service.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="ImageService.html" title="class in NTNU.IDATT1002.service">ImageService</a></th>
+<td class="colLast">
+<div class="block">Image service</div>
+</td>
+</tr>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="PdfDocument.html" title="class in NTNU.IDATT1002.service">PdfDocument</a></th>
+<td class="colLast">
+<div class="block">Class PdfDocument.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="TagService.html" title="class in NTNU.IDATT1002.service">TagService</a></th>
+<td class="colLast">
+<div class="block">Tag Service.</div>
+</td>
+</tr>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="UserService.html" title="class in NTNU.IDATT1002.service">UserService</a></th>
+<td class="colLast">
+<div class="block">User Service</div>
+</td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+</div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li class="navBarCell1Rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/service/package-tree.html b/javadoc/NTNU/IDATT1002/service/package-tree.html
new file mode 100644
index 0000000000000000000000000000000000000000..69706d84fd45b6326805ddaa047ed4d4aef3a7f8
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/service/package-tree.html
@@ -0,0 +1,172 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>NTNU.IDATT1002.service Class Hierarchy</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="NTNU.IDATT1002.service Class Hierarchy";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="header">
+<h1 class="title">Hierarchy For Package NTNU.IDATT1002.service</h1>
+<span class="packageHierarchyLabel">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../../../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<div class="contentContainer">
+<section role="region">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li class="circle">java.lang.Object
+<ul>
+<li class="circle">NTNU.IDATT1002.service.<a href="AlbumService.html" title="class in NTNU.IDATT1002.service"><span class="typeNameLink">AlbumService</span></a></li>
+<li class="circle">NTNU.IDATT1002.service.<a href="ImageService.html" title="class in NTNU.IDATT1002.service"><span class="typeNameLink">ImageService</span></a></li>
+<li class="circle">NTNU.IDATT1002.service.<a href="PdfDocument.html" title="class in NTNU.IDATT1002.service"><span class="typeNameLink">PdfDocument</span></a> (implements NTNU.IDATT1002.service.<a href="AlbumDocument.html" title="interface in NTNU.IDATT1002.service">AlbumDocument</a>)</li>
+<li class="circle">NTNU.IDATT1002.service.<a href="TagService.html" title="class in NTNU.IDATT1002.service"><span class="typeNameLink">TagService</span></a></li>
+<li class="circle">NTNU.IDATT1002.service.<a href="UserService.html" title="class in NTNU.IDATT1002.service"><span class="typeNameLink">UserService</span></a></li>
+</ul>
+</li>
+</ul>
+</section>
+<section role="region">
+<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
+<ul>
+<li class="circle">NTNU.IDATT1002.service.<a href="AlbumDocument.html" title="interface in NTNU.IDATT1002.service"><span class="typeNameLink">AlbumDocument</span></a></li>
+</ul>
+</section>
+</div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="navBarCell1Rev">Tree</li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/utils/Authentication.html b/javadoc/NTNU/IDATT1002/utils/Authentication.html
index 11fefafb21e9e4e25f822bfdc138852e429b6a83..b2161079613041d0c67e99199807cd76fd55dbae 100644
--- a/javadoc/NTNU/IDATT1002/utils/Authentication.html
+++ b/javadoc/NTNU/IDATT1002/utils/Authentication.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>Authentication</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
@@ -200,18 +200,18 @@ extends java.lang.Object</pre>
</tr>
<tr id="i0" class="altColor">
<td class="colFirst"><code>static boolean</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#isCorrectPassword(java.lang.String,java.lang.String)">isCorrectPassword</a></span>​(java.lang.String username,
- java.lang.String password)</code></th>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#isCorrectPassword(java.lang.String,java.lang.String,java.lang.String)">isCorrectPassword</a></span>​(java.lang.String salt,
+ java.lang.String password,
+ java.lang.String expectedHash)</code></th>
<td class="colLast">
-<div class="block">Gets hash and salt from database with the username
+<div class="block">Gets hash and salt from database with the salt
Hashes input password with same algorithm and salt as when created
Compares the expected has and the new hash</div>
</td>
</tr>
<tr id="i1" class="rowColor">
-<td class="colFirst"><code>static boolean</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setPassword(java.lang.String,java.lang.String)">setPassword</a></span>​(java.lang.String username,
- java.lang.String password)</code></th>
+<td class="colFirst"><code>static java.util.ArrayList<java.lang.String></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setPassword(java.lang.String)">setPassword</a></span>​(java.lang.String password)</code></th>
<td class="colLast">
<div class="block">Hashes password with salt from getSalt method</div>
</td>
@@ -278,15 +278,13 @@ extends java.lang.Object</pre>
<!-- -->
</a>
<h3>Method Detail</h3>
-<a id="setPassword(java.lang.String,java.lang.String)">
+<a id="setPassword(java.lang.String)">
<!-- -->
</a>
<ul class="blockList">
<li class="blockList">
<h4>setPassword</h4>
-<pre class="methodSignature">public static boolean setPassword​(java.lang.String username,
- java.lang.String password)
- throws java.security.NoSuchAlgorithmException</pre>
+<pre class="methodSignature">public static java.util.ArrayList<java.lang.String> setPassword​(java.lang.String password)</pre>
<div class="block">Hashes password with salt from getSalt method</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -298,20 +296,21 @@ extends java.lang.Object</pre>
</dl>
</li>
</ul>
-<a id="isCorrectPassword(java.lang.String,java.lang.String)">
+<a id="isCorrectPassword(java.lang.String,java.lang.String,java.lang.String)">
<!-- -->
</a>
<ul class="blockListLast">
<li class="blockList">
<h4>isCorrectPassword</h4>
-<pre class="methodSignature">public static boolean isCorrectPassword​(java.lang.String username,
- java.lang.String password)</pre>
-<div class="block">Gets hash and salt from database with the username
+<pre class="methodSignature">public static boolean isCorrectPassword​(java.lang.String salt,
+ java.lang.String password,
+ java.lang.String expectedHash)</pre>
+<div class="block">Gets hash and salt from database with the salt
Hashes input password with same algorithm and salt as when created
Compares the expected has and the new hash</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>username</code> - to get the stored hash on give user</dd>
+<dd><code>salt</code> - to get the stored hash on give user</dd>
<dd><code>password</code> - that will be hashed and compared to original hash</dd>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>boolean of whether the hashes are similiar or not</dd>
diff --git a/javadoc/NTNU/IDATT1002/utils/ExtractMetaData.html b/javadoc/NTNU/IDATT1002/utils/ExtractMetaData.html
index eec1cef4b920f9d83d9fd0501cdfb783e64d8adc..f76045e5126816f07923a3553fbde1b68fc84f90 100644
--- a/javadoc/NTNU/IDATT1002/utils/ExtractMetaData.html
+++ b/javadoc/NTNU/IDATT1002/utils/ExtractMetaData.html
@@ -124,7 +124,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li>java.lang.Object</li>
<li>
<ul class="inheritance">
-<li>NTNU.IDATT1002.utils.ExtractMetaData</li>
+<li>NTNU.IDATT1002.utils.MetaDataExtractor</li>
</ul>
</li>
</ul>
diff --git a/javadoc/NTNU/IDATT1002/utils/ImageUtil.html b/javadoc/NTNU/IDATT1002/utils/ImageUtil.html
new file mode 100644
index 0000000000000000000000000000000000000000..da18aab1d0cfc806d8da3aca6a522cede15e1411
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/utils/ImageUtil.html
@@ -0,0 +1,339 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>ImageUtil</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="ImageUtil";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":9,"i1":9};
+var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.utils</a></div>
+<h2 title="Class ImageUtil" class="title">Class ImageUtil</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.utils.ImageUtil</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">ImageUtil</span>
+extends java.lang.Object</pre>
+<div class="block">Image Util class for performing <a href="../models/Image.html" title="class in NTNU.IDATT1002.models"><code>Image</code></a> related utility operations,
+ such as converting a file to a byte array and <a href="../models/Image.html" title="class in NTNU.IDATT1002.models"><code>Image</code></a> to <code>Image</code>.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">ImageUtil</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t1" class="tableTab"><span><a href="javascript:show(1);">Static Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static byte[]</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertToBytes(java.lang.String)">convertToBytes</a></span>​(java.lang.String path)</code></th>
+<td class="colLast">
+<div class="block">Convert the file on the given path to a byte array.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static javafx.scene.image.Image</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertToFXImage(NTNU.IDATT1002.models.Image)">convertToFXImage</a></span>​(<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a> image)</code></th>
+<td class="colLast">
+<div class="block">Convert the given domain image to a javafx image which can be displayed by a controller.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>ImageUtil</h4>
+<pre>public ImageUtil()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="convertToBytes(java.lang.String)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>convertToBytes</h4>
+<pre class="methodSignature">public static byte[] convertToBytes​(java.lang.String path)</pre>
+<div class="block">Convert the file on the given path to a byte array.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>path</code> - the path to the file to be converted</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the file, represented as a byte array</dd>
+</dl>
+</li>
+</ul>
+<a id="convertToFXImage(NTNU.IDATT1002.models.Image)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>convertToFXImage</h4>
+<pre class="methodSignature">public static javafx.scene.image.Image convertToFXImage​(<a href="../models/Image.html" title="class in NTNU.IDATT1002.models">Image</a> image)</pre>
+<div class="block">Convert the given domain image to a javafx image which can be displayed by a controller.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>image</code> - the image to convert</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the converted image.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/utils/MetaDataExtractor.html b/javadoc/NTNU/IDATT1002/utils/MetaDataExtractor.html
new file mode 100644
index 0000000000000000000000000000000000000000..a549bd8bff5834d286e23949f42619785baa7ebc
--- /dev/null
+++ b/javadoc/NTNU/IDATT1002/utils/MetaDataExtractor.html
@@ -0,0 +1,338 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>MetaDataExtractor</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../../../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../../../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="MetaDataExtractor";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var data = {"i0":10,"i1":10};
+var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
+var altColor = "altColor";
+var rowColor = "rowColor";
+var tableTab = "tableTab";
+var activeTableTab = "activeTableTab";
+var pathtoroot = "../../../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span> <a href="package-summary.html">NTNU.IDATT1002.utils</a></div>
+<h2 title="Class MetaDataExtractor" class="title">Class MetaDataExtractor</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>java.lang.Object</li>
+<li>
+<ul class="inheritance">
+<li>NTNU.IDATT1002.utils.MetaDataExtractor</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">MetaDataExtractor</span>
+extends java.lang.Object</pre>
+<div class="block">Class MetaDataExtractor. Extracts metadata and geolocation and histogram from it.</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!-- -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">MetaDataExtractor</a></span>()</code></th>
+<td class="colLast"> </td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!-- -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd"> </span></span><span id="t2" class="tableTab"><span><a href="javascript:show(2);">Instance Methods</a></span><span class="tabEnd"> </span></span><span id="t4" class="tableTab"><span><a href="javascript:show(8);">Concrete Methods</a></span><span class="tabEnd"> </span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code><a href="../models/GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getGeoLocation(java.io.File)">getGeoLocation</a></span>​(java.io.File file)</code></th>
+<td class="colLast">
+<div class="block">Returns a string with the GPS position</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code><a href="../models/Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getHistogram(java.io.File)">getHistogram</a></span>​(java.io.File file)</code></th>
+<td class="colLast">
+<div class="block">TODO: Decide what data to store.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.java.lang.Object">
+<!-- -->
+</a>
+<h3>Methods inherited from class java.lang.Object</h3>
+<code>clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!-- -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="<init>()">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>MetaDataExtractor</h4>
+<pre>public MetaDataExtractor()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!-- -->
+</a>
+<h3>Method Detail</h3>
+<a id="getGeoLocation(java.io.File)">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getGeoLocation</h4>
+<pre class="methodSignature">public <a href="../models/GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a> getGeoLocation​(java.io.File file)</pre>
+<div class="block">Returns a string with the GPS position</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>com.drew.imaging.ImageProcessingException</code></dd>
+<dd><code>java.io.IOException</code></dd>
+<dd><code>com.drew.metadata.MetadataException</code></dd>
+</dl>
+</li>
+</ul>
+<a id="getHistogram(java.io.File)">
+<!-- -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getHistogram</h4>
+<pre class="methodSignature">public <a href="../models/Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a> getHistogram​(java.io.File file)</pre>
+<div class="block">TODO: Decide what data to store.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>file</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="navBarCell1Rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<div>
+<ul class="subNavList">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor.summary">Constr</a> | </li>
+<li><a href="#method.summary">Method</a></li>
+</ul>
+<ul class="subNavList">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor.detail">Constr</a> | </li>
+<li><a href="#method.detail">Method</a></li>
+</ul>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/NTNU/IDATT1002/utils/package-summary.html b/javadoc/NTNU/IDATT1002/utils/package-summary.html
index 5b80ca386b1a87f43abc8ee783e452a54528f3fc..1404b39074902bf57c4c86e02f117ec82bb823f6 100644
--- a/javadoc/NTNU/IDATT1002/utils/package-summary.html
+++ b/javadoc/NTNU/IDATT1002/utils/package-summary.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>NTNU.IDATT1002.utils</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
@@ -111,16 +111,17 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<td class="colLast"> </td>
</tr>
<tr class="rowColor">
-<th class="colFirst" scope="row"><a href="CreateUser.html" title="class in NTNU.IDATT1002.utils">CreateUser</a></th>
-<td class="colLast"> </td>
+<th class="colFirst" scope="row"><a href="ImageUtil.html" title="class in NTNU.IDATT1002.utils">ImageUtil</a></th>
+<td class="colLast">
+<div class="block">Image Util class for performing <a href="../models/Image.html" title="class in NTNU.IDATT1002.models"><code>Image</code></a> related utility operations,
+ such as converting a file to a byte array and <a href="../models/Image.html" title="class in NTNU.IDATT1002.models"><code>Image</code></a> to <code>Image</code>.</div>
+</td>
</tr>
<tr class="altColor">
-<th class="colFirst" scope="row"><a href="ExtractMetaData.html" title="class in NTNU.IDATT1002.utils">ExtractMetaData</a></th>
-<td class="colLast"> </td>
-</tr>
-<tr class="rowColor">
-<th class="colFirst" scope="row"><a href="MultiplePhotos.html" title="class in NTNU.IDATT1002.utils">MultiplePhotos</a></th>
-<td class="colLast"> </td>
+<th class="colFirst" scope="row"><a href="MetaDataExtractor.html" title="class in NTNU.IDATT1002.utils">MetaDataExtractor</a></th>
+<td class="colLast">
+<div class="block">Class MetaDataExtractor.</div>
+</td>
</tr>
</tbody>
</table>
diff --git a/javadoc/NTNU/IDATT1002/utils/package-tree.html b/javadoc/NTNU/IDATT1002/utils/package-tree.html
index 19ad011175f142799b8b2b600fcea995048bdd9d..a00faf8d25f5aadc2d5093d9dabdf859fc3aba98 100644
--- a/javadoc/NTNU/IDATT1002/utils/package-tree.html
+++ b/javadoc/NTNU/IDATT1002/utils/package-tree.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>NTNU.IDATT1002.utils Class Hierarchy</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../../../script.js"></script>
@@ -107,9 +107,8 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<li class="circle">java.lang.Object
<ul>
<li class="circle">NTNU.IDATT1002.utils.<a href="Authentication.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">Authentication</span></a></li>
-<li class="circle">NTNU.IDATT1002.utils.<a href="CreateUser.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">CreateUser</span></a></li>
-<li class="circle">NTNU.IDATT1002.utils.<a href="ExtractMetaData.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">ExtractMetaData</span></a></li>
-<li class="circle">NTNU.IDATT1002.utils.<a href="MultiplePhotos.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">MultiplePhotos</span></a></li>
+<li class="circle">NTNU.IDATT1002.utils.<a href="ImageUtil.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">ImageUtil</span></a></li>
+<li class="circle">NTNU.IDATT1002.utils.<a href="MetaDataExtractor.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">MetaDataExtractor</span></a></li>
</ul>
</li>
</ul>
diff --git a/javadoc/allclasses-index.html b/javadoc/allclasses-index.html
index 34142d8d4dafbcf1f7311c9f511360e372d5e832..64c8e6b6b62be434391935ef6b46509e0987b48e 100644
--- a/javadoc/allclasses-index.html
+++ b/javadoc/allclasses-index.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>All Classes</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
@@ -28,7 +28,7 @@
catch(err) {
}
//-->
-var data = {"i0":2,"i1":2,"i2":2,"i3":2,"i4":2,"i5":2,"i6":2,"i7":2,"i8":2,"i9":2,"i10":2,"i11":1,"i12":2,"i13":2};
+var data = {"i0":2,"i1":1,"i2":2,"i3":2,"i4":2,"i5":2,"i6":2,"i7":2,"i8":2,"i9":2,"i10":2,"i11":2,"i12":2,"i13":2,"i14":2,"i15":2,"i16":2,"i17":2,"i18":2,"i19":2,"i20":2,"i21":2,"i22":2,"i23":2,"i24":2,"i25":2,"i26":2,"i27":2,"i28":2,"i29":2,"i30":2,"i31":2,"i32":1,"i33":2,"i34":2,"i35":2,"i36":2,"i37":2,"i38":2,"i39":2,"i40":2,"i41":2,"i42":2,"i43":2,"i44":2,"i45":2};
var tabs = {65535:["t0","All Classes"],1:["t1","Interface Summary"],2:["t2","Class Summary"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -112,67 +112,284 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<th class="colLast" scope="col">Description</th>
</tr>
<tr id="i0" class="altColor">
-<td class="colFirst"><a href="NTNU/IDATT1002/App.html" title="class in NTNU.IDATT1002">App</a></td>
-<th class="colLast" scope="row"> </th>
+<td class="colFirst"><a href="NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></td>
+<th class="colLast" scope="row">
+<div class="block">Class Album representing an album.</div>
+</th>
</tr>
<tr id="i1" class="rowColor">
-<td class="colFirst"><a href="NTNU/IDATT1002/utils/Authentication.html" title="class in NTNU.IDATT1002.utils">Authentication</a></td>
-<th class="colLast" scope="row"> </th>
+<td class="colFirst"><a href="NTNU/IDATT1002/service/AlbumDocument.html" title="interface in NTNU.IDATT1002.service">AlbumDocument</a></td>
+<th class="colLast" scope="row">
+<div class="block">Album Document Interface.</div>
+</th>
</tr>
<tr id="i2" class="altColor">
-<td class="colFirst"><a href="NTNU/IDATT1002/utils/CreateUser.html" title="class in NTNU.IDATT1002.utils">CreateUser</a></td>
-<th class="colLast" scope="row"> </th>
+<td class="colFirst"><a href="NTNU/IDATT1002/filters/AlbumFilter.html" title="class in NTNU.IDATT1002.filters">AlbumFilter</a></td>
+<th class="colLast" scope="row">
+<div class="block">Album Filter.</div>
+</th>
</tr>
<tr id="i3" class="rowColor">
-<td class="colFirst"><a href="NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></td>
-<th class="colLast" scope="row"> </th>
+<td class="colFirst"><a href="NTNU/IDATT1002/repository/AlbumRepository.html" title="class in NTNU.IDATT1002.repository">AlbumRepository</a></td>
+<th class="colLast" scope="row">
+<div class="block">Album Repository.</div>
+</th>
</tr>
<tr id="i4" class="altColor">
-<td class="colFirst"><a href="NTNU/IDATT1002/utils/ExtractMetaData.html" title="class in NTNU.IDATT1002.utils">ExtractMetaData</a></td>
-<th class="colLast" scope="row"> </th>
+<td class="colFirst"><a href="NTNU/IDATT1002/service/AlbumService.html" title="class in NTNU.IDATT1002.service">AlbumService</a></td>
+<th class="colLast" scope="row">
+<div class="block">Album Service.</div>
+</th>
</tr>
<tr id="i5" class="rowColor">
-<td class="colFirst"><a href="NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></td>
+<td class="colFirst"><a href="NTNU/IDATT1002/App.html" title="class in NTNU.IDATT1002">App</a></td>
<th class="colLast" scope="row"> </th>
</tr>
<tr id="i6" class="altColor">
-<td class="colFirst"><a href="NTNU/IDATT1002/models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a></td>
+<td class="colFirst"><a href="NTNU/IDATT1002/ApplicationState.html" title="class in NTNU.IDATT1002">ApplicationState</a></td>
<th class="colLast" scope="row">
-<div class="block">Class ImageAlbum representing an image album.</div>
+<div class="block">Class Application State.</div>
</th>
</tr>
<tr id="i7" class="rowColor">
-<td class="colFirst"><a href="NTNU/IDATT1002/repository/ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository">ImageAlbumRepository</a></td>
+<td class="colFirst"><a href="NTNU/IDATT1002/utils/Authentication.html" title="class in NTNU.IDATT1002.utils">Authentication</a></td>
+<th class="colLast" scope="row"> </th>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></td>
<th class="colLast" scope="row">
-<div class="block">Image Album Repository.</div>
+<div class="block">Controls the buttons and changeable elements on create_album.fxml,
+ a page where you create albums</div>
</th>
</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><a href="NTNU/IDATT1002/controllers/LoggedInController.html" title="class in NTNU.IDATT1002.controllers">LoggedInController</a></td>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></td>
+<th class="colLast" scope="row">
+<div class="block">Class for storing temporary variables between controllers,
+ when the scene changes</div>
+</th>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/database/EntityManagerConfig.html" title="class in NTNU.IDATT1002.database">EntityManagerConfig</a></td>
+<th class="colLast" scope="row">
+<div class="block">Entity Manager Configuration Singleton for overriding hibernate persistence properties.</div>
+</th>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></td>
+<th class="colLast" scope="row">
+<div class="block">Controls the buttons and changeable elements on explore.fxml,
+ a page where you explore images</div>
+</th>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></td>
+<th class="colLast" scope="row">
+<div class="block">Controls the buttons and changeable elements on explore_albums.fxml,
+ a page where you explore albums</div>
+</th>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/models/GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a></td>
+<th class="colLast" scope="row">
+<div class="block">Creates table Geolocation</div>
+</th>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/repository/GeoLocatioRepository.html" title="class in NTNU.IDATT1002.repository">GeoLocatioRepository</a></td>
<th class="colLast" scope="row"> </th>
</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><a href="NTNU/IDATT1002/controllers/LoginController.html" title="class in NTNU.IDATT1002.controllers">LoginController</a></td>
+<tr id="i15" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/models/Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a></td>
+<th class="colLast" scope="row">
+<div class="block">Creates histogram table</div>
+</th>
+</tr>
+<tr id="i16" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/repository/HistorgramRepository.html" title="class in NTNU.IDATT1002.repository">HistorgramRepository</a></td>
<th class="colLast" scope="row"> </th>
</tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><a href="NTNU/IDATT1002/utils/MultiplePhotos.html" title="class in NTNU.IDATT1002.utils">MultiplePhotos</a></td>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></td>
<th class="colLast" scope="row"> </th>
</tr>
-<tr id="i11" class="rowColor">
+<tr id="i18" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/filters/ImageFilter.html" title="class in NTNU.IDATT1002.filters">ImageFilter</a></td>
+<th class="colLast" scope="row">
+<div class="block">Album Filter.</div>
+</th>
+</tr>
+<tr id="i19" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/repository/ImageRepository.html" title="class in NTNU.IDATT1002.repository">ImageRepository</a></td>
+<th class="colLast" scope="row">
+<div class="block">Image Repository.</div>
+</th>
+</tr>
+<tr id="i20" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/service/ImageService.html" title="class in NTNU.IDATT1002.service">ImageService</a></td>
+<th class="colLast" scope="row">
+<div class="block">Image service</div>
+</th>
+</tr>
+<tr id="i21" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/utils/ImageUtil.html" title="class in NTNU.IDATT1002.utils">ImageUtil</a></td>
+<th class="colLast" scope="row">
+<div class="block">Image Util class for performing <a href="NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models"><code>Image</code></a> related utility operations,
+ such as converting a file to a byte array and <a href="NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models"><code>Image</code></a> to <code>Image</code>.</div>
+</th>
+</tr>
+<tr id="i22" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/database/LoadDatabase.html" title="class in NTNU.IDATT1002.database">LoadDatabase</a></td>
+<th class="colLast" scope="row">
+<div class="block">Loads test data into the database.</div>
+</th>
+</tr>
+<tr id="i23" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/controllers/Login.html" title="class in NTNU.IDATT1002.controllers">Login</a></td>
+<th class="colLast" scope="row">
+<div class="block">Controls the buttons and changeable elements on login.fxml,
+ the page where you log into the application</div>
+</th>
+</tr>
+<tr id="i24" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/models/Login.html" title="class in NTNU.IDATT1002.models">Login</a></td>
+<th class="colLast" scope="row"> </th>
+</tr>
+<tr id="i25" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/repository/LoginRepository.html" title="class in NTNU.IDATT1002.repository">LoginRepository</a></td>
+<th class="colLast" scope="row">
+<div class="block">Login Repository
+
+ Implements <a href="NTNU/IDATT1002/repository/Repository.html" title="interface in NTNU.IDATT1002.repository"><code>Repository</code></a> whick supports CRUD operations.</div>
+</th>
+</tr>
+<tr id="i26" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></td>
+<th class="colLast" scope="row">
+<div class="block">Controls the buttons and changeable elements on main.fxml,
+ a page where you explore albums</div>
+</th>
+</tr>
+<tr id="i27" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></td>
+<th class="colLast" scope="row">
+<div class="block">Controls the buttons and changeable elements on map.fxml,
+ a page where you can find images by location</div>
+</th>
+</tr>
+<tr id="i28" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a></td>
+<th class="colLast" scope="row">
+<div class="block">Creates Metadata table</div>
+</th>
+</tr>
+<tr id="i29" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/utils/MetaDataExtractor.html" title="class in NTNU.IDATT1002.utils">MetaDataExtractor</a></td>
+<th class="colLast" scope="row">
+<div class="block">Class MetaDataExtractor.</div>
+</th>
+</tr>
+<tr id="i30" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/repository/MetadataRepository.html" title="class in NTNU.IDATT1002.repository">MetadataRepository</a></td>
+<th class="colLast" scope="row">
+<div class="block">Tag Repository.</div>
+</th>
+</tr>
+<tr id="i31" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/service/PdfDocument.html" title="class in NTNU.IDATT1002.service">PdfDocument</a></td>
+<th class="colLast" scope="row">
+<div class="block">Class PdfDocument.</div>
+</th>
+</tr>
+<tr id="i32" class="altColor">
<td class="colFirst"><a href="NTNU/IDATT1002/repository/Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><<a href="NTNU/IDATT1002/repository/Repository.html" title="type parameter in Repository">T</a>,​<a href="NTNU/IDATT1002/repository/Repository.html" title="type parameter in Repository">ID</a>></td>
<th class="colLast" scope="row">
<div class="block">Entity Repository Interface.</div>
</th>
</tr>
-<tr id="i12" class="altColor">
-<td class="colFirst"><a href="NTNU/IDATT1002/controllers/SignUpController.html" title="class in NTNU.IDATT1002.controllers">SignUpController</a></td>
-<th class="colLast" scope="row"> </th>
+<tr id="i33" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></td>
+<th class="colLast" scope="row">
+<div class="block">Controls the buttons and changeable elements on search.fxml,
+ a page where you can search for images and sort them</div>
+</th>
</tr>
-<tr id="i13" class="rowColor">
+<tr id="i34" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></td>
+<th class="colLast" scope="row">
+<div class="block">Controls the buttons and changeable elements on signup.fxml,
+ a page where you create a new user for the application</div>
+</th>
+</tr>
+<tr id="i35" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a></td>
+<th class="colLast" scope="row">
+<div class="block">Creates table named tag</div>
+</th>
+</tr>
+<tr id="i36" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/repository/TagRepository.html" title="class in NTNU.IDATT1002.repository">TagRepository</a></td>
+<th class="colLast" scope="row">
+<div class="block">Tag Repository.</div>
+</th>
+</tr>
+<tr id="i37" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/service/TagService.html" title="class in NTNU.IDATT1002.service">TagService</a></td>
+<th class="colLast" scope="row">
+<div class="block">Tag Service.</div>
+</th>
+</tr>
+<tr id="i38" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></td>
+<th class="colLast" scope="row">
+<div class="block">Controls the buttons and changeable elements on upload.fxml,
+ a page where you select images to upload</div>
+</th>
+</tr>
+<tr id="i39" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></td>
+<th class="colLast" scope="row">
+<div class="block">Controls the buttons and changeable elements on upload_multiple.fxml,
+ a page where you add descriptions to your selected images</div>
+</th>
+</tr>
+<tr id="i40" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></td>
+<th class="colLast" scope="row">
+<div class="block">Controls the buttons and changeable elements on upload_single.fxml,
+ a page where you add descriptions to your selected image</div>
+</th>
+</tr>
+<tr id="i41" class="rowColor">
<td class="colFirst"><a href="NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></td>
<th class="colLast" scope="row"> </th>
</tr>
+<tr id="i42" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/repository/UserRepository.html" title="class in NTNU.IDATT1002.repository">UserRepository</a></td>
+<th class="colLast" scope="row">
+<div class="block">User Repository.</div>
+</th>
+</tr>
+<tr id="i43" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/service/UserService.html" title="class in NTNU.IDATT1002.service">UserService</a></td>
+<th class="colLast" scope="row">
+<div class="block">User Service</div>
+</th>
+</tr>
+<tr id="i44" class="altColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></td>
+<th class="colLast" scope="row">
+<div class="block">Controls the buttons and changeable elements on view_album.fxml,
+ a page where get a more detailed view of an album</div>
+</th>
+</tr>
+<tr id="i45" class="rowColor">
+<td class="colFirst"><a href="NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></td>
+<th class="colLast" scope="row">
+<div class="block">Controls the buttons and changeable elements on view_.fxml,
+ a page where get a more detailed view of a picture</div>
+</th>
+</tr>
</table>
</li>
</ul>
diff --git a/javadoc/allclasses.html b/javadoc/allclasses.html
index cfcbff4891edc30934a59da1df4786a0af4dbe4f..19b2e39a09ed1c7dfd92f5fea4a16c9538510209 100644
--- a/javadoc/allclasses.html
+++ b/javadoc/allclasses.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>All Classes</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
@@ -22,20 +22,52 @@
<h1 class="bar">All Classes</h1>
<main role="main" class="indexContainer">
<ul>
+<li><a href="NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></li>
+<li><a href="NTNU/IDATT1002/service/AlbumDocument.html" title="interface in NTNU.IDATT1002.service"><span class="interfaceName">AlbumDocument</span></a></li>
+<li><a href="NTNU/IDATT1002/filters/AlbumFilter.html" title="class in NTNU.IDATT1002.filters">AlbumFilter</a></li>
+<li><a href="NTNU/IDATT1002/repository/AlbumRepository.html" title="class in NTNU.IDATT1002.repository">AlbumRepository</a></li>
+<li><a href="NTNU/IDATT1002/service/AlbumService.html" title="class in NTNU.IDATT1002.service">AlbumService</a></li>
<li><a href="NTNU/IDATT1002/App.html" title="class in NTNU.IDATT1002">App</a></li>
+<li><a href="NTNU/IDATT1002/ApplicationState.html" title="class in NTNU.IDATT1002">ApplicationState</a></li>
<li><a href="NTNU/IDATT1002/utils/Authentication.html" title="class in NTNU.IDATT1002.utils">Authentication</a></li>
-<li><a href="NTNU/IDATT1002/utils/CreateUser.html" title="class in NTNU.IDATT1002.utils">CreateUser</a></li>
-<li><a href="NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></li>
-<li><a href="NTNU/IDATT1002/utils/ExtractMetaData.html" title="class in NTNU.IDATT1002.utils">ExtractMetaData</a></li>
+<li><a href="NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></li>
+<li><a href="NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></li>
+<li><a href="NTNU/IDATT1002/database/EntityManagerConfig.html" title="class in NTNU.IDATT1002.database">EntityManagerConfig</a></li>
+<li><a href="NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></li>
+<li><a href="NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></li>
+<li><a href="NTNU/IDATT1002/models/GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a></li>
+<li><a href="NTNU/IDATT1002/repository/GeoLocatioRepository.html" title="class in NTNU.IDATT1002.repository">GeoLocatioRepository</a></li>
+<li><a href="NTNU/IDATT1002/models/Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a></li>
+<li><a href="NTNU/IDATT1002/repository/HistorgramRepository.html" title="class in NTNU.IDATT1002.repository">HistorgramRepository</a></li>
<li><a href="NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></li>
-<li><a href="NTNU/IDATT1002/models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a></li>
-<li><a href="NTNU/IDATT1002/repository/ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository">ImageAlbumRepository</a></li>
-<li><a href="NTNU/IDATT1002/controllers/LoggedInController.html" title="class in NTNU.IDATT1002.controllers">LoggedInController</a></li>
-<li><a href="NTNU/IDATT1002/controllers/LoginController.html" title="class in NTNU.IDATT1002.controllers">LoginController</a></li>
-<li><a href="NTNU/IDATT1002/utils/MultiplePhotos.html" title="class in NTNU.IDATT1002.utils">MultiplePhotos</a></li>
+<li><a href="NTNU/IDATT1002/filters/ImageFilter.html" title="class in NTNU.IDATT1002.filters">ImageFilter</a></li>
+<li><a href="NTNU/IDATT1002/repository/ImageRepository.html" title="class in NTNU.IDATT1002.repository">ImageRepository</a></li>
+<li><a href="NTNU/IDATT1002/service/ImageService.html" title="class in NTNU.IDATT1002.service">ImageService</a></li>
+<li><a href="NTNU/IDATT1002/utils/ImageUtil.html" title="class in NTNU.IDATT1002.utils">ImageUtil</a></li>
+<li><a href="NTNU/IDATT1002/database/LoadDatabase.html" title="class in NTNU.IDATT1002.database">LoadDatabase</a></li>
+<li><a href="NTNU/IDATT1002/controllers/Login.html" title="class in NTNU.IDATT1002.controllers">Login</a></li>
+<li><a href="NTNU/IDATT1002/models/Login.html" title="class in NTNU.IDATT1002.models">Login</a></li>
+<li><a href="NTNU/IDATT1002/repository/LoginRepository.html" title="class in NTNU.IDATT1002.repository">LoginRepository</a></li>
+<li><a href="NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></li>
+<li><a href="NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></li>
+<li><a href="NTNU/IDATT1002/models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a></li>
+<li><a href="NTNU/IDATT1002/utils/MetaDataExtractor.html" title="class in NTNU.IDATT1002.utils">MetaDataExtractor</a></li>
+<li><a href="NTNU/IDATT1002/repository/MetadataRepository.html" title="class in NTNU.IDATT1002.repository">MetadataRepository</a></li>
+<li><a href="NTNU/IDATT1002/service/PdfDocument.html" title="class in NTNU.IDATT1002.service">PdfDocument</a></li>
<li><a href="NTNU/IDATT1002/repository/Repository.html" title="interface in NTNU.IDATT1002.repository"><span class="interfaceName">Repository</span></a></li>
-<li><a href="NTNU/IDATT1002/controllers/SignUpController.html" title="class in NTNU.IDATT1002.controllers">SignUpController</a></li>
+<li><a href="NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></li>
+<li><a href="NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></li>
+<li><a href="NTNU/IDATT1002/models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a></li>
+<li><a href="NTNU/IDATT1002/repository/TagRepository.html" title="class in NTNU.IDATT1002.repository">TagRepository</a></li>
+<li><a href="NTNU/IDATT1002/service/TagService.html" title="class in NTNU.IDATT1002.service">TagService</a></li>
+<li><a href="NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></li>
+<li><a href="NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></li>
+<li><a href="NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></li>
<li><a href="NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></li>
+<li><a href="NTNU/IDATT1002/repository/UserRepository.html" title="class in NTNU.IDATT1002.repository">UserRepository</a></li>
+<li><a href="NTNU/IDATT1002/service/UserService.html" title="class in NTNU.IDATT1002.service">UserService</a></li>
+<li><a href="NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></li>
+<li><a href="NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></li>
</ul>
</main>
</body>
diff --git a/javadoc/allpackages-index.html b/javadoc/allpackages-index.html
index 7dd96f7b2416ed169e896820c704c98f6cb1eefa..6191ce697a6bf5973d5fec5f006262b85b9b6dad 100644
--- a/javadoc/allpackages-index.html
+++ b/javadoc/allpackages-index.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>All Packages</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
@@ -115,6 +115,14 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<td class="colLast"> </td>
</tr>
<tr class="altColor">
+<th class="colFirst" scope="row"><a href="NTNU/IDATT1002/database/package-summary.html">NTNU.IDATT1002.database</a></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="NTNU/IDATT1002/filters/package-summary.html">NTNU.IDATT1002.filters</a></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor">
<th class="colFirst" scope="row"><a href="NTNU/IDATT1002/models/package-summary.html">NTNU.IDATT1002.models</a></th>
<td class="colLast"> </td>
</tr>
@@ -123,6 +131,10 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<td class="colLast"> </td>
</tr>
<tr class="altColor">
+<th class="colFirst" scope="row"><a href="NTNU/IDATT1002/service/package-summary.html">NTNU.IDATT1002.service</a></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor">
<th class="colFirst" scope="row"><a href="NTNU/IDATT1002/utils/package-summary.html">NTNU.IDATT1002.utils</a></th>
<td class="colLast"> </td>
</tr>
diff --git a/javadoc/constant-values.html b/javadoc/constant-values.html
index 4902960551a1516b1be34577881c527a867a54e0..eed3d4090da37ede6f3708ad154d765565c02bca 100644
--- a/javadoc/constant-values.html
+++ b/javadoc/constant-values.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>Constant Field Values</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
@@ -110,7 +110,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<ul class="blockList">
<li class="blockList">
<table class="constantsSummary">
-<caption><span>NTNU.IDATT1002.repository.<a href="NTNU/IDATT1002/repository/ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository">ImageAlbumRepository</a></span><span class="tabEnd"> </span></caption>
+<caption><span>NTNU.IDATT1002.repository.<a href="NTNU/IDATT1002/repository/AlbumRepository.html" title="class in NTNU.IDATT1002.repository">AlbumRepository</a></span><span class="tabEnd"> </span></caption>
<tr>
<th class="colFirst" scope="col">Modifier and Type</th>
<th class="colSecond" scope="col">Constant Field</th>
@@ -118,11 +118,30 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</tr>
<tbody>
<tr class="altColor">
-<td class="colFirst"><a id="NTNU.IDATT1002.repository.ImageAlbumRepository.IMAGE_ALBUM_FIND_BY_TITLE">
+<td class="colFirst"><a id="NTNU.IDATT1002.repository.AlbumRepository.ALBUM_FIND_BY_USERNAME">
<!-- -->
</a><code>public static final java.lang.String</code></td>
-<th class="colSecond" scope="row"><code><a href="NTNU/IDATT1002/repository/ImageAlbumRepository.html#IMAGE_ALBUM_FIND_BY_TITLE">IMAGE_ALBUM_FIND_BY_TITLE</a></code></th>
-<td class="colLast"><code>"ImageAlbum.findAllByTitle"</code></td>
+<th class="colSecond" scope="row"><code><a href="NTNU/IDATT1002/repository/AlbumRepository.html#ALBUM_FIND_BY_USERNAME">ALBUM_FIND_BY_USERNAME</a></code></th>
+<td class="colLast"><code>"Album.findAllByUsername"</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+<li class="blockList">
+<table class="constantsSummary">
+<caption><span>NTNU.IDATT1002.repository.<a href="NTNU/IDATT1002/repository/ImageRepository.html" title="class in NTNU.IDATT1002.repository">ImageRepository</a></span><span class="tabEnd"> </span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a id="NTNU.IDATT1002.repository.ImageRepository.IMAGE_FIND_BY_USERNAME">
+<!-- -->
+</a><code>public static final java.lang.String</code></td>
+<th class="colSecond" scope="row"><code><a href="NTNU/IDATT1002/repository/ImageRepository.html#IMAGE_FIND_BY_USERNAME">IMAGE_FIND_BY_USERNAME</a></code></th>
+<td class="colLast"><code>"Album.findAllByUsername"</code></td>
</tr>
</tbody>
</table>
diff --git a/javadoc/deprecated-list.html b/javadoc/deprecated-list.html
index 32980cfd581d65aefc5840e77f034985878b46aa..c2da095286c45bb561a7c6647083bf946cf4c0d6 100644
--- a/javadoc/deprecated-list.html
+++ b/javadoc/deprecated-list.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>Deprecated List</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
diff --git a/javadoc/element-list b/javadoc/element-list
index fd2b299a7a685c7aa5e59d61bb1485ceba15a274..b5f8674b6a14ee24e1f6862a5589243411f6d0af 100644
--- a/javadoc/element-list
+++ b/javadoc/element-list
@@ -1,5 +1,8 @@
NTNU.IDATT1002
NTNU.IDATT1002.controllers
+NTNU.IDATT1002.database
+NTNU.IDATT1002.filters
NTNU.IDATT1002.models
NTNU.IDATT1002.repository
+NTNU.IDATT1002.service
NTNU.IDATT1002.utils
diff --git a/javadoc/help-doc.html b/javadoc/help-doc.html
index 85636008501b9f3c0d4a795aebb76d4de58d0772..ab93b2e6044f7510555fcf16da2abb2ccb4a329b 100644
--- a/javadoc/help-doc.html
+++ b/javadoc/help-doc.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>API Help</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
diff --git a/javadoc/index-files/index-1.html b/javadoc/index-files/index-1.html
index b504542b14546cbb86ba80eea427510d11336315..bae8fdbee8f826438225fd22417d516bf9443610 100644
--- a/javadoc/index-files/index-1.html
+++ b/javadoc/index-files/index-1.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>A-Index</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../script.js"></script>
@@ -93,23 +93,130 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</nav>
</header>
<main role="main">
-<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:A">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:A">
<!-- -->
</a>
<h2 class="title">A</h2>
<dl>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#addImageAlbum(NTNU.IDATT1002.models.ImageAlbum)">addImageAlbum(ImageAlbum)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#acceptBtn">acceptBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#acceptBtn">acceptBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#acceptDrop(javafx.scene.input.DragEvent)">acceptDrop(DragEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd>
+<div class="block">Method that decides if something can be dropped
+ The method is called whenever something is hoovered over the drag-drop pane</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#add_images_button">add_images_button</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#addAlbum(NTNU.IDATT1002.models.Album)">addAlbum(Album)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd>
+<div class="block">Add this image in the given album.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#addAlbum(NTNU.IDATT1002.models.Album)">addAlbum(Album)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd>
+<div class="block">Add given album.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#addImage(NTNU.IDATT1002.models.Image)">addImage(Image)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd>
+<div class="block">Add given image to this album.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#addImage(NTNU.IDATT1002.models.Image)">addImage(Image)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd>
+<div class="block">Add given image.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/AlbumService.html#addImageToAlbum(NTNU.IDATT1002.models.Album,NTNU.IDATT1002.models.Image)">addImageToAlbum(Album, Image)</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/AlbumService.html" title="class in NTNU.IDATT1002.service">AlbumService</a></dt>
+<dd>
+<div class="block">Add given image to the given album.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#addTag(NTNU.IDATT1002.models.Tag)">addTag(Tag)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd>
+<div class="block">Add given tag to this album</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#addTag(NTNU.IDATT1002.models.Tag)">addTag(Tag)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#addTags(java.util.ArrayList)">addTags(ArrayList<Tag>)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/AlbumService.html#addTagToAlbum(NTNU.IDATT1002.models.Album,NTNU.IDATT1002.models.Tag)">addTagToAlbum(Album, Tag)</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/AlbumService.html" title="class in NTNU.IDATT1002.service">AlbumService</a></dt>
+<dd>
+<div class="block">Adds the given tag to the given album.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/ImageService.html#addTagToImage(NTNU.IDATT1002.models.Image,NTNU.IDATT1002.models.Tag)">addTagToImage(Image, Tag)</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/ImageService.html" title="class in NTNU.IDATT1002.service">ImageService</a></dt>
+<dd>
+<div class="block">Adds the given tag to the given album.</div>
+</dd>
+<dt><a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Album</span></a> - Class in <a href="../NTNU/IDATT1002/models/package-summary.html">NTNU.IDATT1002.models</a></dt>
+<dd>
+<div class="block">Class Album representing an album.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#%3Cinit%3E()">Album()</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#album_authorField">album_authorField</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#album_desc_field">album_desc_field</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#album_descField">album_descField</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#album_fields_grid_pane">album_fields_grid_pane</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/AlbumRepository.html#ALBUM_FIND_BY_USERNAME">ALBUM_FIND_BY_USERNAME</a></span> - Static variable in class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/AlbumRepository.html" title="class in NTNU.IDATT1002.repository">AlbumRepository</a></dt>
+<dd>
+<div class="block">Mapping to @NamedQuery 'find all albums by users username' defined in <a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models"><code>Album</code></a></div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#album_tag_field">album_tag_field</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#album_tagsField">album_tagsField</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#album_title_field">album_title_field</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#album_titleField">album_titleField</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#albumAmount">albumAmount</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/service/AlbumDocument.html" title="interface in NTNU.IDATT1002.service"><span class="typeNameLink">AlbumDocument</span></a> - Interface in <a href="../NTNU/IDATT1002/service/package-summary.html">NTNU.IDATT1002.service</a></dt>
+<dd>
+<div class="block">Album Document Interface.</div>
+</dd>
+<dt><a href="../NTNU/IDATT1002/filters/AlbumFilter.html" title="class in NTNU.IDATT1002.filters"><span class="typeNameLink">AlbumFilter</span></a> - Class in <a href="../NTNU/IDATT1002/filters/package-summary.html">NTNU.IDATT1002.filters</a></dt>
+<dd>
+<div class="block">Album Filter.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/filters/AlbumFilter.html#%3Cinit%3E()">AlbumFilter()</a></span> - Constructor for class NTNU.IDATT1002.filters.<a href="../NTNU/IDATT1002/filters/AlbumFilter.html" title="class in NTNU.IDATT1002.filters">AlbumFilter</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#albumImage">albumImage</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/repository/AlbumRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">AlbumRepository</span></a> - Class in <a href="../NTNU/IDATT1002/repository/package-summary.html">NTNU.IDATT1002.repository</a></dt>
+<dd>
+<div class="block">Album Repository.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/AlbumRepository.html#%3Cinit%3E(javax.persistence.EntityManager)">AlbumRepository(EntityManager)</a></span> - Constructor for class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/AlbumRepository.html" title="class in NTNU.IDATT1002.repository">AlbumRepository</a></dt>
+<dd>
+<div class="block">Constructor to inject <code>EntityManager</code> dependency and sets the class type to <a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models"><code>Album</code></a></div>
+</dd>
+<dt><a href="../NTNU/IDATT1002/service/AlbumService.html" title="class in NTNU.IDATT1002.service"><span class="typeNameLink">AlbumService</span></a> - Class in <a href="../NTNU/IDATT1002/service/package-summary.html">NTNU.IDATT1002.service</a></dt>
+<dd>
+<div class="block">Album Service.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/AlbumService.html#%3Cinit%3E(javax.persistence.EntityManager)">AlbumService(EntityManager)</a></span> - Constructor for class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/AlbumService.html" title="class in NTNU.IDATT1002.service">AlbumService</a></dt>
+<dd>
+<div class="block">Inject entity manager instance to the repositories.</div>
+</dd>
<dt><a href="../NTNU/IDATT1002/App.html" title="class in NTNU.IDATT1002"><span class="typeNameLink">App</span></a> - Class in <a href="../NTNU/IDATT1002/package-summary.html">NTNU.IDATT1002</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/App.html#%3Cinit%3E()">App()</a></span> - Constructor for class NTNU.IDATT1002.<a href="../NTNU/IDATT1002/App.html" title="class in NTNU.IDATT1002">App</a></dt>
<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/ApplicationState.html" title="class in NTNU.IDATT1002"><span class="typeNameLink">ApplicationState</span></a> - Class in <a href="../NTNU/IDATT1002/package-summary.html">NTNU.IDATT1002</a></dt>
+<dd>
+<div class="block">Class Application State.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/ApplicationState.html#%3Cinit%3E()">ApplicationState()</a></span> - Constructor for class NTNU.IDATT1002.<a href="../NTNU/IDATT1002/ApplicationState.html" title="class in NTNU.IDATT1002">ApplicationState</a></dt>
+<dd> </dd>
<dt><a href="../NTNU/IDATT1002/utils/Authentication.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">Authentication</span></a> - Class in <a href="../NTNU/IDATT1002/utils/package-summary.html">NTNU.IDATT1002.utils</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/Authentication.html#%3Cinit%3E()">Authentication()</a></span> - Constructor for class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/Authentication.html" title="class in NTNU.IDATT1002.utils">Authentication</a></dt>
<dd> </dd>
</dl>
-<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
</main>
<footer role="contentinfo">
<nav role="navigation">
diff --git a/javadoc/index-files/index-10.html b/javadoc/index-files/index-10.html
index d8b2045149a64fe4823b851748c72bc5d4a624dd..c73bbf4d6c5e5dc3e694f385e07314897deecc9a 100644
--- a/javadoc/index-files/index-10.html
+++ b/javadoc/index-files/index-10.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
-<title>N-Index</title>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>M-Index</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../script.js"></script>
@@ -22,7 +22,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="N-Index";
+ parent.document.title="M-Index";
}
}
catch(err) {
@@ -93,23 +93,63 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</nav>
</header>
<main role="main">
-<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:N">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:M">
<!-- -->
</a>
-<h2 class="title">N</h2>
+<h2 class="title">M</h2>
<dl>
-<dt><a href="../NTNU/IDATT1002/package-summary.html">NTNU.IDATT1002</a> - package NTNU.IDATT1002</dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/App.html#main(java.lang.String%5B%5D)">main(String[])</a></span> - Static method in class NTNU.IDATT1002.<a href="../NTNU/IDATT1002/App.html" title="class in NTNU.IDATT1002">App</a></dt>
<dd> </dd>
-<dt><a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a> - package NTNU.IDATT1002.controllers</dt>
+<dt><a href="../NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Main</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
+<dd>
+<div class="block">Controls the buttons and changeable elements on main.fxml,
+ a page where you explore albums</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Main.html#%3Cinit%3E()">Main()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></dt>
<dd> </dd>
-<dt><a href="../NTNU/IDATT1002/models/package-summary.html">NTNU.IDATT1002.models</a> - package NTNU.IDATT1002.models</dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#main_picture">main_picture</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
<dd> </dd>
-<dt><a href="../NTNU/IDATT1002/repository/package-summary.html">NTNU.IDATT1002.repository</a> - package NTNU.IDATT1002.repository</dt>
+<dt><a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Map</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
+<dd>
+<div class="block">Controls the buttons and changeable elements on map.fxml,
+ a page where you can find images by location</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#%3Cinit%3E()">Map()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
<dd> </dd>
-<dt><a href="../NTNU/IDATT1002/utils/package-summary.html">NTNU.IDATT1002.utils</a> - package NTNU.IDATT1002.utils</dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#MapSearch(javafx.event.ActionEvent)">MapSearch(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
+<dd>
+<div class="block">Method that searches for images on a specific place</div>
+</dd>
+<dt><a href="../NTNU/IDATT1002/models/Metadata.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Metadata</span></a> - Class in <a href="../NTNU/IDATT1002/models/package-summary.html">NTNU.IDATT1002.models</a></dt>
+<dd>
+<div class="block">Creates Metadata table</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Metadata.html#%3Cinit%3E()">Metadata()</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Metadata.html#%3Cinit%3E(NTNU.IDATT1002.models.Image,NTNU.IDATT1002.models.GeoLocation,NTNU.IDATT1002.models.Histogram)">Metadata(Image, GeoLocation, Histogram)</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#metadata_pane">metadata_pane</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#metadata_pane">metadata_pane</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#metadata_pane">metadata_pane</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/utils/MetaDataExtractor.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">MetaDataExtractor</span></a> - Class in <a href="../NTNU/IDATT1002/utils/package-summary.html">NTNU.IDATT1002.utils</a></dt>
+<dd>
+<div class="block">Class MetaDataExtractor.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/MetaDataExtractor.html#%3Cinit%3E()">MetaDataExtractor()</a></span> - Constructor for class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/MetaDataExtractor.html" title="class in NTNU.IDATT1002.utils">MetaDataExtractor</a></dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/repository/MetadataRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">MetadataRepository</span></a> - Class in <a href="../NTNU/IDATT1002/repository/package-summary.html">NTNU.IDATT1002.repository</a></dt>
+<dd>
+<div class="block">Tag Repository.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/MetadataRepository.html#%3Cinit%3E(javax.persistence.EntityManager)">MetadataRepository(EntityManager)</a></span> - Constructor for class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/MetadataRepository.html" title="class in NTNU.IDATT1002.repository">MetadataRepository</a></dt>
+<dd>
+<div class="block">Constructor to inject <code>EntityManager</code> dependency and sets the class type to <a href="../NTNU/IDATT1002/models/Metadata.html" title="class in NTNU.IDATT1002.models"><code>Metadata</code></a></div>
+</dd>
</dl>
-<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
</main>
<footer role="contentinfo">
<nav role="navigation">
diff --git a/javadoc/index-files/index-11.html b/javadoc/index-files/index-11.html
index 21bbafeef1d12f08b74b0b3068df75053bacd2de..df1205cacfca730a2ae5eb383ab2a97e66fdeb26 100644
--- a/javadoc/index-files/index-11.html
+++ b/javadoc/index-files/index-11.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
-<title>R-Index</title>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>N-Index</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../script.js"></script>
@@ -22,7 +22,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="R-Index";
+ parent.document.title="N-Index";
}
}
catch(err) {
@@ -93,21 +93,29 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</nav>
</header>
<main role="main">
-<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:R">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:N">
<!-- -->
</a>
-<h2 class="title">R</h2>
+<h2 class="title">N</h2>
<dl>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/Authentication.html#r">r</a></span> - Static variable in class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/Authentication.html" title="class in NTNU.IDATT1002.utils">Authentication</a></dt>
+<dt><a href="../NTNU/IDATT1002/package-summary.html">NTNU.IDATT1002</a> - package NTNU.IDATT1002</dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#removeImageAlbum(NTNU.IDATT1002.models.ImageAlbum)">removeImageAlbum(ImageAlbum)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dt><a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a> - package NTNU.IDATT1002.controllers</dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/database/package-summary.html">NTNU.IDATT1002.database</a> - package NTNU.IDATT1002.database</dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/filters/package-summary.html">NTNU.IDATT1002.filters</a> - package NTNU.IDATT1002.filters</dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/models/package-summary.html">NTNU.IDATT1002.models</a> - package NTNU.IDATT1002.models</dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/repository/package-summary.html">NTNU.IDATT1002.repository</a> - package NTNU.IDATT1002.repository</dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/service/package-summary.html">NTNU.IDATT1002.service</a> - package NTNU.IDATT1002.service</dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/utils/package-summary.html">NTNU.IDATT1002.utils</a> - package NTNU.IDATT1002.utils</dt>
<dd> </dd>
-<dt><a href="../NTNU/IDATT1002/repository/Repository.html" title="interface in NTNU.IDATT1002.repository"><span class="typeNameLink">Repository</span></a><<a href="../NTNU/IDATT1002/repository/Repository.html" title="type parameter in Repository">T</a>,​<a href="../NTNU/IDATT1002/repository/Repository.html" title="type parameter in Repository">ID</a>> - Interface in <a href="../NTNU/IDATT1002/repository/package-summary.html">NTNU.IDATT1002.repository</a></dt>
-<dd>
-<div class="block">Entity Repository Interface.</div>
-</dd>
</dl>
-<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
</main>
<footer role="contentinfo">
<nav role="navigation">
diff --git a/javadoc/index-files/index-12.html b/javadoc/index-files/index-12.html
index 5e35844b5f6c5195d92a0cb6a42815f8e7ccfe8e..21edb5e8b680a828d35e83931744e9092899fcbc 100644
--- a/javadoc/index-files/index-12.html
+++ b/javadoc/index-files/index-12.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
-<title>S-Index</title>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>O-Index</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../script.js"></script>
@@ -22,7 +22,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="S-Index";
+ parent.document.title="O-Index";
}
}
catch(err) {
@@ -93,67 +93,19 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</nav>
</header>
<main role="main">
-<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:S">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:O">
<!-- -->
</a>
-<h2 class="title">S</h2>
+<h2 class="title">O</h2>
<dl>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html#save(NTNU.IDATT1002.models.ImageAlbum)">save(ImageAlbum)</a></span> - Method in class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository">ImageAlbumRepository</a></dt>
-<dd>
-<div class="block">Saves a given image album and returns the saved instance.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/Repository.html#save(T)">save(T)</a></span> - Method in interface NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a></dt>
-<dd>
-<div class="block">Saves a given entity and returns the saved instance.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreController.html#scrollpane">scrollpane</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/ImageAlbum.html#setId(java.lang.Long)">setId(Long)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#openPopUpPicture(javafx.scene.input.MouseEvent)">openPopUpPicture(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/Authentication.html#setPassword(java.lang.String,java.lang.String)">setPassword(String, String)</a></span> - Static method in class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/Authentication.html" title="class in NTNU.IDATT1002.utils">Authentication</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#openPopUpPicture(javafx.scene.input.MouseEvent)">openPopUpPicture(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
<dd>
-<div class="block">Hashes password with salt from getSalt method</div>
+<div class="block">Method that opens large version of image in popup</div>
</dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/App.html#setRoot(java.lang.String)">setRoot(String)</a></span> - Static method in class NTNU.IDATT1002.<a href="../NTNU/IDATT1002/App.html" title="class in NTNU.IDATT1002">App</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/ImageAlbum.html#setTitle(java.lang.String)">setTitle(String)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/ImageAlbum.html#setUser(NTNU.IDATT1002.models.User)">setUser(User)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a></dt>
-<dd> </dd>
-<dt><a href="../NTNU/IDATT1002/controllers/SignUpController.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">SignUpController</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/SignUpController.html#%3Cinit%3E()">SignUpController()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/SignUpController.html" title="class in NTNU.IDATT1002.controllers">SignUpController</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/App.html#start(javafx.stage.Stage)">start(Stage)</a></span> - Method in class NTNU.IDATT1002.<a href="../NTNU/IDATT1002/App.html" title="class in NTNU.IDATT1002">App</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/LoggedInController.html#switchToExplore(javafx.event.ActionEvent)">switchToExplore(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/LoggedInController.html" title="class in NTNU.IDATT1002.controllers">LoggedInController</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/LoginController.html#switchToLoggedIn(javafx.event.ActionEvent)">switchToLoggedIn(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/LoginController.html" title="class in NTNU.IDATT1002.controllers">LoginController</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreController.html#switchToMain(javafx.scene.input.MouseEvent)">switchToMain(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreController.html#switchToMap(javafx.event.ActionEvent)">switchToMap(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/LoggedInController.html#switchToMap(javafx.event.ActionEvent)">switchToMap(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/LoggedInController.html" title="class in NTNU.IDATT1002.controllers">LoggedInController</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreController.html#switchToNext(javafx.event.ActionEvent)">switchToNext(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreController.html#switchToPrevious(javafx.event.ActionEvent)">switchToPrevious(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/SignUpController.html#switchToPrimary()">switchToPrimary()</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/SignUpController.html" title="class in NTNU.IDATT1002.controllers">SignUpController</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreController.html#switchToSearch(javafx.event.ActionEvent)">switchToSearch(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/LoggedInController.html#switchToSearch(javafx.event.ActionEvent)">switchToSearch(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/LoggedInController.html" title="class in NTNU.IDATT1002.controllers">LoggedInController</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/LoginController.html#switchToSecondary()">switchToSecondary()</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/LoginController.html" title="class in NTNU.IDATT1002.controllers">LoginController</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreController.html#switchToUpload(javafx.event.ActionEvent)">switchToUpload(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/LoggedInController.html#switchToUpload(javafx.event.ActionEvent)">switchToUpload(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/LoggedInController.html" title="class in NTNU.IDATT1002.controllers">LoggedInController</a></dt>
-<dd> </dd>
</dl>
-<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
</main>
<footer role="contentinfo">
<nav role="navigation">
diff --git a/javadoc/index-files/index-13.html b/javadoc/index-files/index-13.html
index 0c56a5f1e9b537d89d51f10611e684a36a79258b..77f19bf3bacbbd235adf2b6a0cf555d72b813a07 100644
--- a/javadoc/index-files/index-13.html
+++ b/javadoc/index-files/index-13.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
-<title>T-Index</title>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>P-Index</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../script.js"></script>
@@ -22,7 +22,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="T-Index";
+ parent.document.title="P-Index";
}
}
catch(err) {
@@ -93,31 +93,73 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</nav>
</header>
<main role="main">
-<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:T">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:P">
<!-- -->
</a>
-<h2 class="title">T</h2>
+<h2 class="title">P</h2>
<dl>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/LoggedInController.html#tbar_explore">tbar_explore</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/LoggedInController.html" title="class in NTNU.IDATT1002.controllers">LoggedInController</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Login.html#Password">Password</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Login.html" title="class in NTNU.IDATT1002.controllers">Login</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreController.html#tbar_logo">tbar_logo</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></dt>
+<dt><a href="../NTNU/IDATT1002/service/PdfDocument.html" title="class in NTNU.IDATT1002.service"><span class="typeNameLink">PdfDocument</span></a> - Class in <a href="../NTNU/IDATT1002/service/package-summary.html">NTNU.IDATT1002.service</a></dt>
+<dd>
+<div class="block">Class PdfDocument.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/PdfDocument.html#%3Cinit%3E(NTNU.IDATT1002.models.Album,java.lang.String)">PdfDocument(Album, String)</a></span> - Constructor for class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/PdfDocument.html" title="class in NTNU.IDATT1002.service">PdfDocument</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/LoggedInController.html#tbar_logo">tbar_logo</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/LoggedInController.html" title="class in NTNU.IDATT1002.controllers">LoggedInController</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#photo_desc">photo_desc</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreController.html#tbar_map">tbar_map</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#photo_desc">photo_desc</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/LoggedInController.html#tbar_map">tbar_map</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/LoggedInController.html" title="class in NTNU.IDATT1002.controllers">LoggedInController</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#photo_desc2">photo_desc2</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreController.html#tbar_search">tbar_search</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#photo_desc3">photo_desc3</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/LoggedInController.html#tbar_search">tbar_search</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/LoggedInController.html" title="class in NTNU.IDATT1002.controllers">LoggedInController</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#photo_desc4">photo_desc4</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreController.html#tbar_upload">tbar_upload</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#photo_image">photo_image</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/LoggedInController.html#tbar_upload">tbar_upload</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/LoggedInController.html" title="class in NTNU.IDATT1002.controllers">LoggedInController</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#photo_image">photo_image</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#photo_image2">photo_image2</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#photo_image3">photo_image3</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#photo_image4">photo_image4</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#photo_tag">photo_tag</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#photo_tag">photo_tag</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#photo_tag2">photo_tag2</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#photo_tag3">photo_tag3</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#photo_tag4">photo_tag4</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#photo_title">photo_title</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#photo_title">photo_title</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#photo_title2">photo_title2</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#photo_title3">photo_title3</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#photo_title4">photo_title4</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#picture">picture</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#picture_descField">picture_descField</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#picture_tagsField">picture_tagsField</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#picture_tagsField">picture_tagsField</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#picture_title_field">picture_title_field</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#picture_title_field">picture_title_field</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
<dd> </dd>
</dl>
-<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
</main>
<footer role="contentinfo">
<nav role="navigation">
diff --git a/javadoc/index-files/index-14.html b/javadoc/index-files/index-14.html
index 175e492c6821c97fd46290370fd2bc8b1a608199..7d5da462638663c8b1a5d96132c3197f18e7ac19 100644
--- a/javadoc/index-files/index-14.html
+++ b/javadoc/index-files/index-14.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
-<title>U-Index</title>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>R-Index</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../script.js"></script>
@@ -22,7 +22,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="U-Index";
+ parent.document.title="R-Index";
}
}
catch(err) {
@@ -93,17 +93,39 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</nav>
</header>
<main role="main">
-<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:U">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:R">
<!-- -->
</a>
-<h2 class="title">U</h2>
+<h2 class="title">R</h2>
<dl>
-<dt><a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">User</span></a> - Class in <a href="../NTNU/IDATT1002/models/package-summary.html">NTNU.IDATT1002.models</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#%3Cinit%3E()">User()</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/Authentication.html#r">r</a></span> - Static variable in class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/Authentication.html" title="class in NTNU.IDATT1002.utils">Authentication</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#removeAlbum(NTNU.IDATT1002.models.Album)">removeAlbum(Album)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd>
+<div class="block">Remove this image from the given image.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#removeAlbum(NTNU.IDATT1002.models.Album)">removeAlbum(Album)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd>
+<div class="block">Remove given album.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#removeAlbum(NTNU.IDATT1002.models.Image)">removeAlbum(Image)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd>
+<div class="block">Remove given image.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#removeImage(NTNU.IDATT1002.models.Image)">removeImage(Image)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd>
+<div class="block">Remove given image from the album.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#removeTag(NTNU.IDATT1002.models.Tag)">removeTag(Tag)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd>
+<div class="block">Remove given tag to this album</div>
+</dd>
+<dt><a href="../NTNU/IDATT1002/repository/Repository.html" title="interface in NTNU.IDATT1002.repository"><span class="typeNameLink">Repository</span></a><<a href="../NTNU/IDATT1002/repository/Repository.html" title="type parameter in Repository">T</a>,​<a href="../NTNU/IDATT1002/repository/Repository.html" title="type parameter in Repository">ID</a>> - Interface in <a href="../NTNU/IDATT1002/repository/package-summary.html">NTNU.IDATT1002.repository</a></dt>
+<dd>
+<div class="block">Entity Repository Interface.</div>
+</dd>
</dl>
-<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
</main>
<footer role="contentinfo">
<nav role="navigation">
diff --git a/javadoc/index-files/index-15.html b/javadoc/index-files/index-15.html
new file mode 100644
index 0000000000000000000000000000000000000000..bf45f967cf7d95fbe718347d834cb6292229106d
--- /dev/null
+++ b/javadoc/index-files/index-15.html
@@ -0,0 +1,636 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>S-Index</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+<script type="text/javascript" src="../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="S-Index";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var pathtoroot = "../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../index.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:S">
+<!-- -->
+</a>
+<h2 class="title">S</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/Repository.html#save(T)">save(T)</a></span> - Method in interface NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a></dt>
+<dd>
+<div class="block">Saves a given entity and returns the saved instance.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#scroll_button_next">scroll_button_next</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#scroll_button_previous">scroll_button_previous</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#scroll_picture1">scroll_picture1</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#scroll_picture2">scroll_picture2</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#scroll_picture3">scroll_picture3</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#scroll_picture4">scroll_picture4</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#scroll_picture5">scroll_picture5</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#scroll_picture6">scroll_picture6</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#scrollpane">scrollpane</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#scrollpane">scrollpane</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#scrollPane">scrollPane</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#search">search</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Search</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
+<dd>
+<div class="block">Controls the buttons and changeable elements on search.fxml,
+ a page where you can search for images and sort them</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#%3Cinit%3E()">Search()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#search_result">search_result</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/AlbumService.html#searchAlbums(java.lang.String)">searchAlbums(String)</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/AlbumService.html" title="class in NTNU.IDATT1002.service">AlbumService</a></dt>
+<dd>
+<div class="block">Search all images by title, description and tags specified in <a href="../NTNU/IDATT1002/filters/AlbumFilter.html#filter(java.lang.String)"><code>AlbumFilter.filter(String)</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#searchBtn">searchBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/ImageService.html#searchImages(java.lang.String)">searchImages(String)</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/ImageService.html" title="class in NTNU.IDATT1002.service">ImageService</a></dt>
+<dd>
+<div class="block">Search all images by tags specified in <a href="../NTNU/IDATT1002/filters/ImageFilter.html#filter(java.lang.String)"><code>ImageFilter.filter(String)</code></a>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#setBirthDate(java.util.Date)">setBirthDate(Date)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#setCallingCode(java.lang.String)">setCallingCode(String)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/DataExchange.html#setChosenAlbumId(java.lang.Long)">setChosenAlbumId(Long)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/DataExchange.html#setChosenImg(java.lang.String)">setChosenImg(String)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#setCreatedAt(java.util.Date)">setCreatedAt(Date)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/ApplicationState.html#setCurrentUser(NTNU.IDATT1002.models.User)">setCurrentUser(User)</a></span> - Static method in class NTNU.IDATT1002.<a href="../NTNU/IDATT1002/ApplicationState.html" title="class in NTNU.IDATT1002">ApplicationState</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Histogram.html#setData(java.lang.String)">setData(String)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#setDescription(java.lang.String)">setDescription(String)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#setEmail(java.lang.String)">setEmail(String)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/DataExchange.html#setEntityManager(javax.persistence.EntityManager)">setEntityManager(EntityManager)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#setFirstName(java.lang.String)">setFirstName(String)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Metadata.html#setGeoLocation(NTNU.IDATT1002.models.GeoLocation)">setGeoLocation(GeoLocation)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/GeoLocation.html#setGeoLocationId(java.lang.Long)">setGeoLocationId(Long)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Login.html#setHash(java.lang.String)">setHash(String)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Login.html" title="class in NTNU.IDATT1002.models">Login</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Metadata.html#setHistogram(NTNU.IDATT1002.models.Histogram)">setHistogram(Histogram)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Histogram.html#setHistogramId(java.lang.Long)">setHistogramId(Long)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/DataExchange.html#setHostServices(javafx.application.HostServices)">setHostServices(HostServices)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#setId(java.lang.Long)">setId(Long)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#setId(java.lang.Long)">setId(Long)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Metadata.html#setImage(NTNU.IDATT1002.models.Image)">setImage(Image)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#setImages(java.util.List)">setImages(List<Image>)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#setLastName(java.lang.String)">setLastName(String)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/GeoLocation.html#setLatitude(java.lang.String)">setLatitude(String)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/GeoLocation.html#setLongitude(java.lang.String)">setLongitude(String)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/GeoLocation.html#setMetadata(NTNU.IDATT1002.models.Metadata)">setMetadata(Metadata)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Histogram.html#setMetadata(NTNU.IDATT1002.models.Metadata)">setMetadata(Metadata)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#setMetadata(NTNU.IDATT1002.models.Metadata)">setMetadata(Metadata)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Tag.html#setName(java.lang.String)">setName(String)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/Authentication.html#setPassword(java.lang.String)">setPassword(String)</a></span> - Static method in class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/Authentication.html" title="class in NTNU.IDATT1002.utils">Authentication</a></dt>
+<dd>
+<div class="block">Hashes password with salt from getSalt method</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Login.html#setPasswordSalt(java.lang.String)">setPasswordSalt(String)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Login.html" title="class in NTNU.IDATT1002.models">Login</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#setPath(java.lang.String)">setPath(String)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#setPhoneNumber(java.lang.String)">setPhoneNumber(String)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#setRawImage(byte%5B%5D)">setRawImage(byte[])</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/App.html#setRoot(java.lang.String)">setRoot(String)</a></span> - Static method in class NTNU.IDATT1002.<a href="../NTNU/IDATT1002/App.html" title="class in NTNU.IDATT1002">App</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/DataExchange.html#setSearchField(java.lang.String)">setSearchField(String)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Tag.html#setTagId(java.lang.Long)">setTagId(Long)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#setTags(java.util.List)">setTags(List<Tag>)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#setText(java.lang.String,int,int,double,java.lang.String,double)">setText(String, int, int, double, String, double)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#setText(java.lang.String,int,int,java.lang.String,double)">setText(String, int, int, String, double)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#setTitle(java.lang.String)">setTitle(String)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/DataExchange.html#setUploadedFiles(java.util.List)">setUploadedFiles(List<File>)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#setUser(NTNU.IDATT1002.models.User)">setUser(User)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#setUser(NTNU.IDATT1002.models.User)">setUser(User)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Login.html#setUser(NTNU.IDATT1002.models.User)">setUser(User)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Login.html" title="class in NTNU.IDATT1002.models">Login</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#setUsername(java.lang.String)">setUsername(String)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Login.html#signup">signup</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Login.html" title="class in NTNU.IDATT1002.controllers">Login</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/SignUp.html#signup(javafx.event.ActionEvent)">signup(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></dt>
+<dd>
+<div class="block">Method that changes scene to Login</div>
+</dd>
+<dt><a href="../NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">SignUp</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
+<dd>
+<div class="block">Controls the buttons and changeable elements on signup.fxml,
+ a page where you create a new user for the application</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/SignUp.html#%3Cinit%3E()">SignUp()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/SignUp.html#signup_birthDate">signup_birthDate</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/SignUp.html#signup_btn">signup_btn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/SignUp.html#signup_email">signup_email</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/SignUp.html#signup_firstName">signup_firstName</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/SignUp.html#signup_form">signup_form</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/SignUp.html#signup_lastName">signup_lastName</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/SignUp.html#signup_password">signup_password</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/SignUp.html#signup_phoneCode">signup_phoneCode</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/SignUp.html#signup_phoneNr">signup_phoneNr</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/SignUp.html#signup_username">signup_username</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#sorted_by_choicebox">sorted_by_choicebox</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#sortedByChoicebox">sortedByChoicebox</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/App.html#start(javafx.stage.Stage)">start(Stage)</a></span> - Method in class NTNU.IDATT1002.<a href="../NTNU/IDATT1002/App.html" title="class in NTNU.IDATT1002">App</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd>
+<div class="block">Method that changes stage to Albums page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd>
+<div class="block">Method that changes scene to Albums page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd>
+<div class="block">Method that changes scene to Albums page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Main.html#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></dt>
+<dd>
+<div class="block">Method that changes scene to Albums page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
+<dd>
+<div class="block">Method that changes scene to Albums page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd>
+<div class="block">Method that changes scene to Albums page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd>
+<div class="block">Method that changes scene to Albums page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd>
+<div class="block">Method that changes scene to Albums page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd>
+<div class="block">Method that changes stage to Albums page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd>
+<div class="block">Method that changes scene to Albums page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#switchToAlbums(javafx.event.ActionEvent)">switchToAlbums(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd>
+<div class="block">Method that changes scene to Albums page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#switchToCreateAlbum(javafx.event.ActionEvent)">switchToCreateAlbum(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd>
+<div class="block">Method that changes scene to Create Album page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#switchToExplore(javafx.event.ActionEvent)">switchToExplore(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd>
+<div class="block">Method that changes stage to Explore page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#switchToExplore(javafx.event.ActionEvent)">switchToExplore(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd>
+<div class="block">Method that changes scene to Explore page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#switchToExplore(javafx.event.ActionEvent)">switchToExplore(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd>
+<div class="block">Method that changes scene to Explore page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Main.html#switchToExplore(javafx.event.ActionEvent)">switchToExplore(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></dt>
+<dd>
+<div class="block">Method that changes scene to Explore page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#switchToExplore(javafx.event.ActionEvent)">switchToExplore(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
+<dd>
+<div class="block">Method that changes scene to Explore page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#switchToExplore(javafx.event.ActionEvent)">switchToExplore(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd>
+<div class="block">Method that changes scene to Explore page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#switchToExplore(javafx.event.ActionEvent)">switchToExplore(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd>
+<div class="block">Method that changes scene to Explore page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#switchToExplore(javafx.event.ActionEvent)">switchToExplore(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd>
+<div class="block">Method that changes scene to Explore page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#switchToExplore(javafx.event.ActionEvent)">switchToExplore(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd>
+<div class="block">Method that changes stage to Explore page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#switchToExplore(javafx.event.ActionEvent)">switchToExplore(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd>
+<div class="block">Method that changes scene to Explore page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#switchToExplore(javafx.event.ActionEvent)">switchToExplore(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd>
+<div class="block">Method that changes scene to Explore page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#switchToMain(javafx.scene.input.MouseEvent)">switchToMain(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd>
+<div class="block">Method that changes stage to Main page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#switchToMain(javafx.scene.input.MouseEvent)">switchToMain(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd>
+<div class="block">Method that changes scene to Main page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#switchToMain(javafx.scene.input.MouseEvent)">switchToMain(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd>
+<div class="block">Method that changes scene to Main page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Main.html#switchToMain(javafx.scene.input.MouseEvent)">switchToMain(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></dt>
+<dd>
+<div class="block">Method that changes scene to Main page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#switchToMain(javafx.scene.input.MouseEvent)">switchToMain(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
+<dd>
+<div class="block">Method that changes scene to Main page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#switchToMain(javafx.scene.input.MouseEvent)">switchToMain(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd>
+<div class="block">Method that changes scene to Main page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#switchToMain(javafx.scene.input.MouseEvent)">switchToMain(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd>
+<div class="block">Method that changes scene to Main page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#switchToMain(javafx.scene.input.MouseEvent)">switchToMain(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd>
+<div class="block">Method that changes scene to Main page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#switchToMain(javafx.scene.input.MouseEvent)">switchToMain(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd>
+<div class="block">Method that changes stage to Main page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#switchToMain(javafx.scene.input.MouseEvent)">switchToMain(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd>
+<div class="block">Method that changes scene to Main page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#switchToMain(javafx.scene.input.MouseEvent)">switchToMain(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd>
+<div class="block">Method that changes scene to Main page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#switchToMap(javafx.event.ActionEvent)">switchToMap(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd>
+<div class="block">Method that changes stage to Map page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#switchToMap(javafx.event.ActionEvent)">switchToMap(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd>
+<div class="block">Method that changes scene to Map page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#switchToMap(javafx.event.ActionEvent)">switchToMap(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd>
+<div class="block">Method that changes scene to Map page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Main.html#switchToMap(javafx.event.ActionEvent)">switchToMap(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></dt>
+<dd>
+<div class="block">Method that changes scene to Map page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#switchToMap(javafx.event.ActionEvent)">switchToMap(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
+<dd>
+<div class="block">Method that changes scene to Map page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#switchToMap(javafx.event.ActionEvent)">switchToMap(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd>
+<div class="block">Method that changes scene to Map page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#switchToMap(javafx.event.ActionEvent)">switchToMap(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd>
+<div class="block">Method that changes scene to Map page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#switchToMap(javafx.event.ActionEvent)">switchToMap(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd>
+<div class="block">Method that changes scene to Map page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#switchToMap(javafx.event.ActionEvent)">switchToMap(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd>
+<div class="block">Method that changes stage to Map page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#switchToMap(javafx.event.ActionEvent)">switchToMap(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd>
+<div class="block">Method that changes scene to Map page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#switchToMap(javafx.event.ActionEvent)">switchToMap(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd>
+<div class="block">Method that changes scene to Map page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#switchToNext(javafx.event.ActionEvent)">switchToNext(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd>
+<div class="block">Method that updates content to next "page"</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#switchToNext(javafx.event.ActionEvent)">switchToNext(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd>
+<div class="block">Method that updates content to next "page"</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#switchToNext(javafx.event.ActionEvent)">switchToNext(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd>
+<div class="block">Method that updates content to next "page"</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#switchToPicture(javafx.scene.input.MouseEvent)">switchToPicture(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd>
+<div class="block">Method that changes scene to View Picture page for the image that was clicked</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#switchToPicture(javafx.scene.input.MouseEvent)">switchToPicture(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd>
+<div class="block">Method for opening the chosen picture.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#switchToPrevious(javafx.event.ActionEvent)">switchToPrevious(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd>
+<div class="block">Method that updates content to previous "page"</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#switchToPrevious(javafx.event.ActionEvent)">switchToPrevious(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd>
+<div class="block">Method that updates content to previous "page"</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#switchToPrevious(javafx.event.ActionEvent)">switchToPrevious(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd>
+<div class="block">Method that updates content to previous "page"</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#switchToSearch(javafx.event.ActionEvent)">switchToSearch(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd>
+<div class="block">Method that changes stage to Search page.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#switchToSearch(javafx.event.ActionEvent)">switchToSearch(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd>
+<div class="block">Method that changes scene to Search page.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#switchToSearch(javafx.event.ActionEvent)">switchToSearch(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd>
+<div class="block">Method that changes scene to Search page.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Main.html#switchToSearch(javafx.event.ActionEvent)">switchToSearch(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></dt>
+<dd>
+<div class="block">Method that changes scene to Search page.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#switchToSearch(javafx.event.ActionEvent)">switchToSearch(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
+<dd>
+<div class="block">Method that changes scene to Search page.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#switchToSearch(javafx.event.ActionEvent)">switchToSearch(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd>
+<div class="block">Method that changes scene to Search page.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#switchToSearch(javafx.event.ActionEvent)">switchToSearch(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd>
+<div class="block">Method that changes scene to Search page.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#switchToSearch(javafx.event.ActionEvent)">switchToSearch(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd>
+<div class="block">Method that changes scene to Search page.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#switchToSearch(javafx.event.ActionEvent)">switchToSearch(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd>
+<div class="block">Method that changes stage to Search page.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#switchToSearch(javafx.event.ActionEvent)">switchToSearch(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd>
+<div class="block">Method that changes scene to Search page.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#switchToSearch(javafx.event.ActionEvent)">switchToSearch(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd>
+<div class="block">Method that changes scene to Search page.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Login.html#switchToSignup(javafx.event.ActionEvent)">switchToSignup(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Login.html" title="class in NTNU.IDATT1002.controllers">Login</a></dt>
+<dd>
+<div class="block">Method that changes scene to Sign Up page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#switchToUpload(javafx.event.ActionEvent)">switchToUpload(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd>
+<div class="block">Method that changes stage to Upload page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#switchToUpload(javafx.event.ActionEvent)">switchToUpload(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd>
+<div class="block">Method that changes scene to Upload page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#switchToUpload(javafx.event.ActionEvent)">switchToUpload(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd>
+<div class="block">Method that changes scene to Upload page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Main.html#switchToUpload(javafx.event.ActionEvent)">switchToUpload(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></dt>
+<dd>
+<div class="block">Method that changes scene to Upload page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#switchToUpload(javafx.event.ActionEvent)">switchToUpload(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
+<dd>
+<div class="block">Method that changes scene to Upload page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#switchToUpload(javafx.event.ActionEvent)">switchToUpload(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd>
+<div class="block">Method that changes scene to Upload page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#switchToUpload(javafx.event.ActionEvent)">switchToUpload(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd>
+<div class="block">Method that changes scene to Upload page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#switchToUpload(javafx.event.ActionEvent)">switchToUpload(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd>
+<div class="block">Method that changes scene to Upload page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#switchToUpload(javafx.event.ActionEvent)">switchToUpload(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd>
+<div class="block">Method that changes stage to Upload page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#switchToUpload(javafx.event.ActionEvent)">switchToUpload(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd>
+<div class="block">Method that changes scene to Upload page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#switchToUpload(javafx.event.ActionEvent)">switchToUpload(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd>
+<div class="block">Method that changes scene to Upload page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#switchToViewAlbum(javafx.scene.input.MouseEvent)">switchToViewAlbum(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd>
+<div class="block">Method to open specific albums.</div>
+</dd>
+</dl>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../index.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/index-files/index-16.html b/javadoc/index-files/index-16.html
new file mode 100644
index 0000000000000000000000000000000000000000..c2582891f1a038ceabf3609e91984f70de2c33b5
--- /dev/null
+++ b/javadoc/index-files/index-16.html
@@ -0,0 +1,340 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>T-Index</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+<script type="text/javascript" src="../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="T-Index";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var pathtoroot = "../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../index.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:T">
+<!-- -->
+</a>
+<h2 class="title">T</h2>
+<dl>
+<dt><a href="../NTNU/IDATT1002/models/Tag.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Tag</span></a> - Class in <a href="../NTNU/IDATT1002/models/package-summary.html">NTNU.IDATT1002.models</a></dt>
+<dd>
+<div class="block">Creates table named tag</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Tag.html#%3Cinit%3E()">Tag()</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Tag.html#%3Cinit%3E(java.lang.Long,java.lang.String)">Tag(Long, String)</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a></dt>
+<dd>
+<div class="block">Constructor with tagId and name as parameters</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Tag.html#%3Cinit%3E(java.lang.String)">Tag(String)</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a></dt>
+<dd>
+<div class="block">Contructor to set initial tag name.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Tag.html#%3Cinit%3E(NTNU.IDATT1002.models.Tag)">Tag(Tag)</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a></dt>
+<dd>
+<div class="block">Constructor thar takes in a tag object</div>
+</dd>
+<dt><a href="../NTNU/IDATT1002/repository/TagRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">TagRepository</span></a> - Class in <a href="../NTNU/IDATT1002/repository/package-summary.html">NTNU.IDATT1002.repository</a></dt>
+<dd>
+<div class="block">Tag Repository.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/TagRepository.html#%3Cinit%3E(javax.persistence.EntityManager)">TagRepository(EntityManager)</a></span> - Constructor for class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/TagRepository.html" title="class in NTNU.IDATT1002.repository">TagRepository</a></dt>
+<dd>
+<div class="block">Constructor to inject <code>EntityManager</code> dependency and sets the class type to <a href="../NTNU/IDATT1002/models/Tag.html" title="class in NTNU.IDATT1002.models"><code>Tag</code></a></div>
+</dd>
+<dt><a href="../NTNU/IDATT1002/service/TagService.html" title="class in NTNU.IDATT1002.service"><span class="typeNameLink">TagService</span></a> - Class in <a href="../NTNU/IDATT1002/service/package-summary.html">NTNU.IDATT1002.service</a></dt>
+<dd>
+<div class="block">Tag Service.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/TagService.html#%3Cinit%3E()">TagService()</a></span> - Constructor for class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/TagService.html" title="class in NTNU.IDATT1002.service">TagService</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#tagStringSplit(javafx.scene.control.TextField)">tagStringSplit(TextField)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd>
+<div class="block">Method for splitting the tag textField into tags in a list</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#tbar_albums">tbar_albums</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#tbar_albums">tbar_albums</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#tbar_albums">tbar_albums</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Main.html#tbar_albums">tbar_albums</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#tbar_albums">tbar_albums</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#tbar_albums">tbar_albums</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#tbar_albums">tbar_albums</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#tbar_albums">tbar_albums</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#tbar_albums">tbar_albums</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#tbar_albums">tbar_albums</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#tbar_albums">tbar_albums</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#tbar_explore">tbar_explore</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#tbar_explore">tbar_explore</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#tbar_explore">tbar_explore</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Main.html#tbar_explore">tbar_explore</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#tbar_explore">tbar_explore</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#tbar_explore">tbar_explore</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#tbar_explore">tbar_explore</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#tbar_explore">tbar_explore</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#tbar_explore">tbar_explore</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#tbar_explore">tbar_explore</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#tbar_explore">tbar_explore</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#tbar_logo">tbar_logo</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#tbar_logo">tbar_logo</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#tbar_logo">tbar_logo</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Main.html#tbar_logo">tbar_logo</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#tbar_logo">tbar_logo</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#tbar_logo">tbar_logo</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#tbar_logo">tbar_logo</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#tbar_logo">tbar_logo</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#tbar_logo">tbar_logo</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#tbar_logo">tbar_logo</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#tbar_logo">tbar_logo</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#tbar_map">tbar_map</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#tbar_map">tbar_map</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#tbar_map">tbar_map</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Main.html#tbar_map">tbar_map</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#tbar_map">tbar_map</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#tbar_map">tbar_map</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#tbar_map">tbar_map</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#tbar_map">tbar_map</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#tbar_map">tbar_map</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#tbar_map">tbar_map</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#tbar_map">tbar_map</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#tbar_search">tbar_search</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#tbar_search">tbar_search</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#tbar_search">tbar_search</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Main.html#tbar_search">tbar_search</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#tbar_search">tbar_search</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#tbar_search">tbar_search</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#tbar_search">tbar_search</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#tbar_search">tbar_search</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#tbar_search">tbar_search</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#tbar_search">tbar_search</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#tbar_search">tbar_search</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#tbar_searchBtn">tbar_searchBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#tbar_searchBtn">tbar_searchBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#tbar_searchBtn">tbar_searchBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Main.html#tbar_searchBtn">tbar_searchBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#tbar_searchBtn">tbar_searchBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#tbar_searchBtn">tbar_searchBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#tbar_searchBtn">tbar_searchBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#tbar_searchBtn">tbar_searchBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#tbar_searchBtn">tbar_searchBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#tbar_searchBtn">tbar_searchBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#tbar_searchBtn">tbar_searchBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#tbar_upload">tbar_upload</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#tbar_upload">tbar_upload</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#tbar_upload">tbar_upload</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Main.html#tbar_upload">tbar_upload</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Map.html#tbar_upload">tbar_upload</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#tbar_upload">tbar_upload</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#tbar_upload">tbar_upload</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#tbar_upload">tbar_upload</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#tbar_upload">tbar_upload</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#tbar_upload">tbar_upload</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#tbar_upload">tbar_upload</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd> </dd>
+</dl>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../index.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/index-files/index-17.html b/javadoc/index-files/index-17.html
new file mode 100644
index 0000000000000000000000000000000000000000..dc462a8479921bd5371aefe4499308ff37d183a0
--- /dev/null
+++ b/javadoc/index-files/index-17.html
@@ -0,0 +1,211 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>U-Index</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+<script type="text/javascript" src="../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="U-Index";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var pathtoroot = "../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../index.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:U">
+<!-- -->
+</a>
+<h2 class="title">U</h2>
+<dl>
+<dt><a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Upload</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
+<dd>
+<div class="block">Controls the buttons and changeable elements on upload.fxml,
+ a page where you select images to upload</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#%3Cinit%3E()">Upload()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Main.html#uploadBtn">uploadBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#uploadBtn">uploadBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">UploadedMultiple</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
+<dd>
+<div class="block">Controls the buttons and changeable elements on upload_multiple.fxml,
+ a page where you add descriptions to your selected images</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#%3Cinit%3E()">UploadedMultiple()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">UploadedSingle</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
+<dd>
+<div class="block">Controls the buttons and changeable elements on upload_single.fxml,
+ a page where you add descriptions to your selected image</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#%3Cinit%3E()">UploadedSingle()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html#uploadMultiple(javafx.event.ActionEvent)">uploadMultiple(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></dt>
+<dd>
+<div class="block">Method for uploading several images to database with title, tags and description
+ Image itself is not stored but URL is</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#uploadSingle(javafx.event.ActionEvent)">uploadSingle(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd>
+<div class="block">Method for uploading image to database with tags
+ Image itself is not stored but URL is</div>
+</dd>
+<dt><a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">User</span></a> - Class in <a href="../NTNU/IDATT1002/models/package-summary.html">NTNU.IDATT1002.models</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#%3Cinit%3E()">User()</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.util.Date)">User(String, String, String, String, String, String, Date)</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Login.html#Username">Username</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Login.html" title="class in NTNU.IDATT1002.controllers">Login</a></dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/repository/UserRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">UserRepository</span></a> - Class in <a href="../NTNU/IDATT1002/repository/package-summary.html">NTNU.IDATT1002.repository</a></dt>
+<dd>
+<div class="block">User Repository.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/UserRepository.html#%3Cinit%3E(javax.persistence.EntityManager)">UserRepository(EntityManager)</a></span> - Constructor for class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/UserRepository.html" title="class in NTNU.IDATT1002.repository">UserRepository</a></dt>
+<dd>
+<div class="block">Constructor to inject <code>EntityManager</code> dependency and sets the class type to <a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models"><code>User</code></a></div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/SignUp.html#userService">userService</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/service/UserService.html" title="class in NTNU.IDATT1002.service"><span class="typeNameLink">UserService</span></a> - Class in <a href="../NTNU/IDATT1002/service/package-summary.html">NTNU.IDATT1002.service</a></dt>
+<dd>
+<div class="block">User Service</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/UserService.html#%3Cinit%3E(javax.persistence.EntityManager)">UserService(EntityManager)</a></span> - Constructor for class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/UserService.html" title="class in NTNU.IDATT1002.service">UserService</a></dt>
+<dd>
+<div class="block">Inject entity manager instance to the repositories</div>
+</dd>
+</dl>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../index.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/index-files/index-18.html b/javadoc/index-files/index-18.html
new file mode 100644
index 0000000000000000000000000000000000000000..990889b0788f5efd894a17345529d1b36d70736f
--- /dev/null
+++ b/javadoc/index-files/index-18.html
@@ -0,0 +1,168 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="no">
+<head>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>V-Index</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-04-01">
+<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
+<script type="text/javascript" src="../script.js"></script>
+<script type="text/javascript" src="../jquery/jszip/dist/jszip.min.js"></script>
+<script type="text/javascript" src="../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
+<!--[if IE]>
+<script type="text/javascript" src="../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
+<![endif]-->
+<script type="text/javascript" src="../jquery/jquery-3.3.1.js"></script>
+<script type="text/javascript" src="../jquery/jquery-migrate-3.0.1.js"></script>
+<script type="text/javascript" src="../jquery/jquery-ui.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+ try {
+ if (location.href.indexOf('is-external=true') == -1) {
+ parent.document.title="V-Index";
+ }
+ }
+ catch(err) {
+ }
+//-->
+var pathtoroot = "../";
+var useModuleDirectories = true;
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<header role="banner">
+<nav role="navigation">
+<div class="fixedNav">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a id="navbar.top">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.top.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../index.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../allclasses.html">All Classes</a></li>
+</ul>
+<ul class="navListSearch">
+<li><label for="search">SEARCH:</label>
+<input type="text" id="search" value="search" disabled="disabled">
+<input type="reset" id="reset" value="reset" disabled="disabled">
+</li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_top");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.top">
+<!-- -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+</div>
+<div class="navPadding"> </div>
+<script type="text/javascript"><!--
+$('.navPadding').css('padding-top', $('.fixedNav').css("height"));
+//-->
+</script>
+</nav>
+</header>
+<main role="main">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:V">
+<!-- -->
+</a>
+<h2 class="title">V</h2>
+<dl>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#vBox">vBox</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#vBox">vBox</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">ViewAlbum</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
+<dd>
+<div class="block">Controls the buttons and changeable elements on view_album.fxml,
+ a page where get a more detailed view of an album</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#%3Cinit%3E()">ViewAlbum()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">ViewPicture</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
+<dd>
+<div class="block">Controls the buttons and changeable elements on view_.fxml,
+ a page where get a more detailed view of a picture</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#%3Cinit%3E()">ViewPicture()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd> </dd>
+</dl>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+</main>
+<footer role="contentinfo">
+<nav role="navigation">
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a id="navbar.bottom">
+<!-- -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a id="navbar.bottom.firstrow">
+<!-- -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../index.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="navBarCell1Rev">Index</li>
+<li><a href="../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../allclasses.html">All Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+ allClassesLink = document.getElementById("allclasses_navbar_bottom");
+ if(window==top) {
+ allClassesLink.style.display = "block";
+ }
+ else {
+ allClassesLink.style.display = "none";
+ }
+ //-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+</div>
+<a id="skip.navbar.bottom">
+<!-- -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+</nav>
+</footer>
+</body>
+</html>
diff --git a/javadoc/index-files/index-2.html b/javadoc/index-files/index-2.html
index 83edce0dab54b6e4cd14cce1f087c5b415f54579..7468c123831838dc82a3adec6ad05053773133f2 100644
--- a/javadoc/index-files/index-2.html
+++ b/javadoc/index-files/index-2.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>C-Index</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../script.js"></script>
@@ -93,25 +93,85 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</nav>
</header>
<main role="main">
-<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:C">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:C">
<!-- -->
</a>
<h2 class="title">C</h2>
<dl>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html#count()">count()</a></span> - Method in class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository">ImageAlbumRepository</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#changeMainPicture1(javafx.scene.input.MouseEvent)">changeMainPicture1(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#changeMainPicture2(javafx.scene.input.MouseEvent)">changeMainPicture2(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#changeMainPicture3(javafx.scene.input.MouseEvent)">changeMainPicture3(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#changeMainPicture4(javafx.scene.input.MouseEvent)">changeMainPicture4(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#changeMainPicture5(javafx.scene.input.MouseEvent)">changeMainPicture5(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#changeMainPicture6(javafx.scene.input.MouseEvent)">changeMainPicture6(MouseEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#chooseFile()">chooseFile()</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd>
+<div class="block">Method that opens file browser with an image filter
+ The user will choose what files to upload</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/ImageUtil.html#convertToBytes(java.lang.String)">convertToBytes(String)</a></span> - Static method in class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/ImageUtil.html" title="class in NTNU.IDATT1002.utils">ImageUtil</a></dt>
<dd>
-<div class="block">Return the number of image albums.</div>
+<div class="block">Convert the file on the given path to a byte array.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/ImageUtil.html#convertToFXImage(NTNU.IDATT1002.models.Image)">convertToFXImage(Image)</a></span> - Static method in class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/ImageUtil.html" title="class in NTNU.IDATT1002.utils">ImageUtil</a></dt>
+<dd>
+<div class="block">Convert the given domain image to a javafx image which can be displayed by a controller.</div>
</dd>
<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/Repository.html#count()">count()</a></span> - Method in interface NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a></dt>
<dd>
<div class="block">Return the number of entities.</div>
</dd>
-<dt><a href="../NTNU/IDATT1002/utils/CreateUser.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">CreateUser</span></a> - Class in <a href="../NTNU/IDATT1002/utils/package-summary.html">NTNU.IDATT1002.utils</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#create_album_button">create_album_button</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/CreateUser.html#%3Cinit%3E()">CreateUser()</a></span> - Constructor for class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/CreateUser.html" title="class in NTNU.IDATT1002.utils">CreateUser</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#create_album_document">create_album_document</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/AlbumService.html#createAlbum(java.lang.String,java.lang.String,NTNU.IDATT1002.models.User,java.lang.String)">createAlbum(String, String, User, String)</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/AlbumService.html" title="class in NTNU.IDATT1002.service">AlbumService</a></dt>
+<dd>
+<div class="block">Retrieves all albums created by the given user by username.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/AlbumService.html#createAlbum(java.lang.String,java.lang.String,NTNU.IDATT1002.models.User,java.util.List,java.util.List)">createAlbum(String, String, User, List<Tag>, List<Image>)</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/AlbumService.html" title="class in NTNU.IDATT1002.service">AlbumService</a></dt>
+<dd>
+<div class="block">Create a new album with all fields populated.</div>
+</dd>
+<dt><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">CreateAlbum</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
+<dd>
+<div class="block">Controls the buttons and changeable elements on create_album.fxml,
+ a page where you create albums</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#%3Cinit%3E()">CreateAlbum()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#createAlbumButton">createAlbumButton</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/AlbumDocument.html#createDocument()">createDocument()</a></span> - Method in interface NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/AlbumDocument.html" title="interface in NTNU.IDATT1002.service">AlbumDocument</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/PdfDocument.html#createDocument()">createDocument()</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/PdfDocument.html" title="class in NTNU.IDATT1002.service">PdfDocument</a></dt>
+<dd>
+<div class="block">Create a new pdf document.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#createDocument(javafx.event.ActionEvent)">createDocument(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd>
+<div class="block">Retrieve and display album document.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#createEmptyAlbum(javafx.event.ActionEvent)">createEmptyAlbum(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
+<dd>
+<div class="block">Create an empty album.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/ImageService.html#createImage(NTNU.IDATT1002.models.User,java.io.File,java.util.ArrayList)">createImage(User, File, ArrayList<Tag>)</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/ImageService.html" title="class in NTNU.IDATT1002.service">ImageService</a></dt>
+<dd>
+<div class="block">Creates a new image from the input File</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/UserService.html#createUser(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.util.Date,java.lang.String)">createUser(String, String, String, String, String, String, Date, String)</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/UserService.html" title="class in NTNU.IDATT1002.service">UserService</a></dt>
+<dd>
+<div class="block">Creates a new user and sets password on the new user</div>
+</dd>
</dl>
-<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
</main>
<footer role="contentinfo">
<nav role="navigation">
diff --git a/javadoc/index-files/index-3.html b/javadoc/index-files/index-3.html
index 02e7a506c6c7f1180fb2c982013d755d67f803a5..9672dd12fc0dc522656dea21d67a8f7da185081f 100644
--- a/javadoc/index-files/index-3.html
+++ b/javadoc/index-files/index-3.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>D-Index</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../script.js"></script>
@@ -93,15 +93,18 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</nav>
</header>
<main role="main">
-<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:D">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:D">
<!-- -->
</a>
<h2 class="title">D</h2>
<dl>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html#delete(NTNU.IDATT1002.models.ImageAlbum)">delete(ImageAlbum)</a></span> - Method in class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository">ImageAlbumRepository</a></dt>
+<dt><a href="../NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">DataExchange</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
<dd>
-<div class="block">Deletes the given image album.</div>
+<div class="block">Class for storing temporary variables between controllers,
+ when the scene changes</div>
</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/DataExchange.html#%3Cinit%3E()">DataExchange()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></dt>
+<dd> </dd>
<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/Repository.html#delete(T)">delete(T)</a></span> - Method in interface NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a></dt>
<dd>
<div class="block">Deletes the given entity.</div>
@@ -110,12 +113,14 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<dd>
<div class="block">Deletes an entity with the given id.</div>
</dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html#deleteById(java.lang.Long)">deleteById(Long)</a></span> - Method in class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository">ImageAlbumRepository</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#drag_drop">drag_drop</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#droppedFiles(javafx.scene.input.DragEvent)">droppedFiles(DragEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
<dd>
-<div class="block">Deletes an image album with the given id.</div>
+<div class="block">Method that stores the dropped files</div>
</dd>
</dl>
-<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
</main>
<footer role="contentinfo">
<nav role="navigation">
diff --git a/javadoc/index-files/index-4.html b/javadoc/index-files/index-4.html
index 1ebc91d299c28ea9e351f0c4b5dbffa6c76988fd..1a410f5b8e3d8f8beb1897be676559413ce47ad4 100644
--- a/javadoc/index-files/index-4.html
+++ b/javadoc/index-files/index-4.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>E-Index</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../script.js"></script>
@@ -93,31 +93,43 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</nav>
</header>
<main role="main">
-<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:E">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:E">
<!-- -->
</a>
<h2 class="title">E</h2>
<dl>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/ImageAlbum.html#equals(java.lang.Object)">equals(Object)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html#exists(NTNU.IDATT1002.models.ImageAlbum)">exists(ImageAlbum)</a></span> - Method in class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository">ImageAlbumRepository</a></dt>
+<dt><a href="../NTNU/IDATT1002/database/EntityManagerConfig.html" title="class in NTNU.IDATT1002.database"><span class="typeNameLink">EntityManagerConfig</span></a> - Class in <a href="../NTNU/IDATT1002/database/package-summary.html">NTNU.IDATT1002.database</a></dt>
<dd>
-<div class="block">Return whether the given image album exists.</div>
+<div class="block">Entity Manager Configuration Singleton for overriding hibernate persistence properties.</div>
</dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/Repository.html#exists(T)">exists(T)</a></span> - Method in interface NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#equals(java.lang.Object)">equals(Object)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
<dd>
-<div class="block">Return whether the given entity exists.</div>
+<div class="block">Check if this and given entity are equal.</div>
</dd>
-<dt><a href="../NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">ExploreController</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#equals(java.lang.Object)">equals(Object)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Tag.html#equals(java.lang.Object)">equals(Object)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreController.html#%3Cinit%3E()">ExploreController()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#equals(java.lang.Object)">equals(Object)</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
<dd> </dd>
-<dt><a href="../NTNU/IDATT1002/utils/ExtractMetaData.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">ExtractMetaData</span></a> - Class in <a href="../NTNU/IDATT1002/utils/package-summary.html">NTNU.IDATT1002.utils</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/App.html#ex">ex</a></span> - Static variable in class NTNU.IDATT1002.<a href="../NTNU/IDATT1002/App.html" title="class in NTNU.IDATT1002">App</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/ExtractMetaData.html#%3Cinit%3E(java.io.File)">ExtractMetaData(File)</a></span> - Constructor for class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/ExtractMetaData.html" title="class in NTNU.IDATT1002.utils">ExtractMetaData</a></dt>
+<dt><a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Explore</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
+<dd>
+<div class="block">Controls the buttons and changeable elements on explore.fxml,
+ a page where you explore images</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#%3Cinit%3E()">Explore()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">ExploreAlbums</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
+<dd>
+<div class="block">Controls the buttons and changeable elements on explore_albums.fxml,
+ a page where you explore albums</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#%3Cinit%3E()">ExploreAlbums()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
<dd> </dd>
</dl>
-<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
</main>
<footer role="contentinfo">
<nav role="navigation">
diff --git a/javadoc/index-files/index-5.html b/javadoc/index-files/index-5.html
index a56c9808fa48418d0c4e64eda7e52c019020dbcf..f75008458d6fb5274f036aa0d7489bdcd5632d04 100644
--- a/javadoc/index-files/index-5.html
+++ b/javadoc/index-files/index-5.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>F-Index</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../script.js"></script>
@@ -93,37 +93,50 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</nav>
</header>
<main role="main">
-<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:F">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:F">
<!-- -->
</a>
<h2 class="title">F</h2>
<dl>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html#findAll()">findAll()</a></span> - Method in class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository">ImageAlbumRepository</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/filters/AlbumFilter.html#filter(java.lang.String)">filter(String)</a></span> - Static method in class NTNU.IDATT1002.filters.<a href="../NTNU/IDATT1002/filters/AlbumFilter.html" title="class in NTNU.IDATT1002.filters">AlbumFilter</a></dt>
<dd>
-<div class="block">Retrieves all instances of type image album.</div>
+<div class="block">Chain the predicates and test the album by the given query.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/filters/ImageFilter.html#filter(java.lang.String)">filter(String)</a></span> - Static method in class NTNU.IDATT1002.filters.<a href="../NTNU/IDATT1002/filters/ImageFilter.html" title="class in NTNU.IDATT1002.filters">ImageFilter</a></dt>
+<dd>
+<div class="block">Image filter can filter an album by tags
+ Uses method filterByTags</div>
</dd>
<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/Repository.html#findAll()">findAll()</a></span> - Method in interface NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a></dt>
<dd>
<div class="block">Retrieves all instances of the type.</div>
</dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html#findAllByTitle(java.lang.String)">findAllByTitle(String)</a></span> - Method in class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository">ImageAlbumRepository</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/AlbumRepository.html#findAllByUsername(java.lang.String)">findAllByUsername(String)</a></span> - Method in class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/AlbumRepository.html" title="class in NTNU.IDATT1002.repository">AlbumRepository</a></dt>
+<dd>
+<div class="block">Retrieves all albums of the user with the given username.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/ImageRepository.html#findAllByUsername(java.lang.String)">findAllByUsername(String)</a></span> - Method in class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/ImageRepository.html" title="class in NTNU.IDATT1002.repository">ImageRepository</a></dt>
<dd>
-<div class="block">Retrieves all image albums with the given title.</div>
+<div class="block">Retrieves all albums of the user with the given username.</div>
</dd>
<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/Repository.html#findById(ID)">findById(ID)</a></span> - Method in interface NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a></dt>
<dd>
<div class="block">Retrieves an entity with the given id.</div>
</dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html#findById(java.lang.Long)">findById(Long)</a></span> - Method in class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository">ImageAlbumRepository</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/MetadataRepository.html#findOrCreate(NTNU.IDATT1002.models.Metadata)">findOrCreate(Metadata)</a></span> - Method in class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/MetadataRepository.html" title="class in NTNU.IDATT1002.repository">MetadataRepository</a></dt>
+<dd>
+<div class="block">Retrieves a tag if found and creates it if not.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/TagRepository.html#findOrCreate(NTNU.IDATT1002.models.Tag)">findOrCreate(Tag)</a></span> - Method in class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/TagRepository.html" title="class in NTNU.IDATT1002.repository">TagRepository</a></dt>
<dd>
-<div class="block">Retrieves an image album with the given id.</div>
+<div class="block">Retrieves a tag if found and creates it if not.</div>
</dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreController.html#footer_next_page">footer_next_page</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#footer_nextBtn">footer_nextBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreController.html#footer_previous_page">footer_previous_page</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers">ExploreController</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#footer_previousBtn">footer_previousBtn</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
<dd> </dd>
</dl>
-<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
</main>
<footer role="contentinfo">
<nav role="navigation">
diff --git a/javadoc/index-files/index-6.html b/javadoc/index-files/index-6.html
index 1f4a8cc79c63bdbe8dc8cb7e1d07faff5bf2da47..e257fbd2164732fe484ba2a684d0983717246bbe 100644
--- a/javadoc/index-files/index-6.html
+++ b/javadoc/index-files/index-6.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>G-Index</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../script.js"></script>
@@ -93,23 +93,169 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</nav>
</header>
<main role="main">
-<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:G">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:G">
<!-- -->
</a>
<h2 class="title">G</h2>
<dl>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/ExtractMetaData.html#getAll()">getAll()</a></span> - Method in class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/ExtractMetaData.html" title="class in NTNU.IDATT1002.utils">ExtractMetaData</a></dt>
+<dt><a href="../NTNU/IDATT1002/models/GeoLocation.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">GeoLocation</span></a> - Class in <a href="../NTNU/IDATT1002/models/package-summary.html">NTNU.IDATT1002.models</a></dt>
<dd>
-<div class="block">Extracts all data possible for a image</div>
+<div class="block">Creates table Geolocation</div>
</dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/ImageAlbum.html#getId()">getId()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/GeoLocation.html#%3Cinit%3E()">GeoLocation()</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/ExtractMetaData.html#getNecessary()">getNecessary()</a></span> - Method in class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/ExtractMetaData.html" title="class in NTNU.IDATT1002.utils">ExtractMetaData</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/GeoLocation.html#%3Cinit%3E(java.lang.String,java.lang.String)">GeoLocation(String, String)</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a></dt>
<dd>
-<div class="block">Returns all predetermined metadata as an ArrayList</div>
+<div class="block">Creates constructor for geolocation that takes in each parameter</div>
</dd>
+<dt><a href="../NTNU/IDATT1002/repository/GeoLocatioRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">GeoLocatioRepository</span></a> - Class in <a href="../NTNU/IDATT1002/repository/package-summary.html">NTNU.IDATT1002.repository</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/GeoLocatioRepository.html#%3Cinit%3E(javax.persistence.EntityManager)">GeoLocatioRepository(EntityManager)</a></span> - Constructor for class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/GeoLocatioRepository.html" title="class in NTNU.IDATT1002.repository">GeoLocatioRepository</a></dt>
+<dd>
+<div class="block">Constructor to inject <code>EntityManager</code> dependency.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/AlbumService.html#getAlbumById(java.lang.Long)">getAlbumById(Long)</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/AlbumService.html" title="class in NTNU.IDATT1002.service">AlbumService</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/AlbumService.html#getAlbumFromUser(NTNU.IDATT1002.models.User)">getAlbumFromUser(User)</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/AlbumService.html" title="class in NTNU.IDATT1002.service">AlbumService</a></dt>
+<dd>
+<div class="block">Retrieves all albums created by the given user by username.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#getAlbums()">getAlbums()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/AlbumService.html#getAllAlbums()">getAllAlbums()</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/AlbumService.html" title="class in NTNU.IDATT1002.service">AlbumService</a></dt>
+<dd>
+<div class="block">Retrieves all albums.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/ImageService.html#getAllImages()">getAllImages()</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/ImageService.html" title="class in NTNU.IDATT1002.service">ImageService</a></dt>
+<dd>
+<div class="block">Retrieves all images.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#getBirthDate()">getBirthDate()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#getCallingCode()">getCallingCode()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/DataExchange.html#getChosenAlbumId()">getChosenAlbumId()</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/DataExchange.html#getChosenImg()">getChosenImg()</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#getCreatedAt()">getCreatedAt()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/ApplicationState.html#getCurrentUser()">getCurrentUser()</a></span> - Static method in class NTNU.IDATT1002.<a href="../NTNU/IDATT1002/ApplicationState.html" title="class in NTNU.IDATT1002">ApplicationState</a></dt>
+<dd>
+<div class="block">Retrieve the current logged in user if present, or retrieve an anonymous user.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Histogram.html#getData()">getData()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#getDescription()">getDescription()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/AlbumDocument.html#getDocument()">getDocument()</a></span> - Method in interface NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/AlbumDocument.html" title="interface in NTNU.IDATT1002.service">AlbumDocument</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/PdfDocument.html#getDocument()">getDocument()</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/PdfDocument.html" title="class in NTNU.IDATT1002.service">PdfDocument</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/AlbumService.html#getDocument(java.lang.Long)">getDocument(Long)</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/AlbumService.html" title="class in NTNU.IDATT1002.service">AlbumService</a></dt>
+<dd>
+<div class="block">Create and return a new document for the album with the given id.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#getEmail()">getEmail()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/DataExchange.html#getEntityManager()">getEntityManager()</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/database/EntityManagerConfig.html#getEntityManager()">getEntityManager()</a></span> - Static method in class NTNU.IDATT1002.database.<a href="../NTNU/IDATT1002/database/EntityManagerConfig.html" title="class in NTNU.IDATT1002.database">EntityManagerConfig</a></dt>
+<dd>
+<div class="block">Retrieve the entity manager instance.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Upload.html#getExtension(java.lang.String)">getExtension(String)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></dt>
+<dd>
+<div class="block">Method that finds the extension of a file</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#getFirstName()">getFirstName()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Metadata.html#getGeoLocation()">getGeoLocation()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/MetaDataExtractor.html#getGeoLocation(java.io.File)">getGeoLocation(File)</a></span> - Method in class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/MetaDataExtractor.html" title="class in NTNU.IDATT1002.utils">MetaDataExtractor</a></dt>
+<dd>
+<div class="block">Returns a string with the GPS position</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/GeoLocation.html#getGeoLocationId()">getGeoLocationId()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Login.html#getHash()">getHash()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Login.html" title="class in NTNU.IDATT1002.models">Login</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Metadata.html#getHistogram()">getHistogram()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/MetaDataExtractor.html#getHistogram(java.io.File)">getHistogram(File)</a></span> - Method in class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/MetaDataExtractor.html" title="class in NTNU.IDATT1002.utils">MetaDataExtractor</a></dt>
+<dd>
+<div class="block">TODO: Decide what data to store.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Histogram.html#getHistogramId()">getHistogramId()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/DataExchange.html#getHostServices()">getHostServices()</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#getId()">getId()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#getId()">getId()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Metadata.html#getImage()">getImage()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/ImageService.html#getImageFromUser(NTNU.IDATT1002.models.User)">getImageFromUser(User)</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/ImageService.html" title="class in NTNU.IDATT1002.service">ImageService</a></dt>
+<dd>
+<div class="block">Finds each picture belonging to a specific user</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#getImages()">getImages()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#getLastName()">getLastName()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/GeoLocation.html#getLatitude()">getLatitude()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/GeoLocation.html#getLongitude()">getLongitude()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#getMetadata()">getMetadata()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Metadata.html#getMetadataId()">getMetadataId()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Tag.html#getName()">getName()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Login.html#getPasswordSalt()">getPasswordSalt()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Login.html" title="class in NTNU.IDATT1002.models">Login</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#getPath()">getPath()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#getPhoneNumber()">getPhoneNumber()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#getRawImage()">getRawImage()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/DataExchange.html#getSearchField()">getSearchField()</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Tag.html#getTagId()">getTagId()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#getTags()">getTags()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#getTags()">getTags()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/TagService.html#getTagsAsString(java.util.List)">getTagsAsString(List<Tag>)</a></span> - Static method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/TagService.html" title="class in NTNU.IDATT1002.service">TagService</a></dt>
+<dd>
+<div class="block">Retrieves tags from list of tags and converts them to a concatenated string.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/TagService.html#getTagsFromString(java.lang.String)">getTagsFromString(String)</a></span> - Static method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/TagService.html" title="class in NTNU.IDATT1002.service">TagService</a></dt>
+<dd>
+<div class="block">Retrieves tags from text field and converts them to a list of tag objects.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#getTitle()">getTitle()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#getUpdatedAt()">getUpdatedAt()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#getUploadedAt()">getUploadedAt()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/DataExchange.html#getUploadedFiles()">getUploadedFiles()</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Album.html#getUser()">getUser()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Login.html#getUser()">getUser()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Login.html" title="class in NTNU.IDATT1002.models">Login</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#getUsername()">getUsername()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#gridPane">gridPane</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd> </dd>
</dl>
-<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
</main>
<footer role="contentinfo">
<nav role="navigation">
diff --git a/javadoc/index-files/index-7.html b/javadoc/index-files/index-7.html
index 1b66e5c5b4199df8680c8bd3cd7703b5ebdc99a4..1a3305fdb45ecc10f50e383f293118fca7417c25 100644
--- a/javadoc/index-files/index-7.html
+++ b/javadoc/index-files/index-7.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
-<title>I-Index</title>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>H-Index</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../script.js"></script>
@@ -22,7 +22,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="I-Index";
+ parent.document.title="H-Index";
}
}
catch(err) {
@@ -93,39 +93,27 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</nav>
</header>
<main role="main">
-<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:I">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:H">
<!-- -->
</a>
-<h2 class="title">I</h2>
+<h2 class="title">H</h2>
<dl>
-<dt><a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Image</span></a> - Class in <a href="../NTNU/IDATT1002/models/package-summary.html">NTNU.IDATT1002.models</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#%3Cinit%3E()">Image()</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
-<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html#IMAGE_ALBUM_FIND_BY_TITLE">IMAGE_ALBUM_FIND_BY_TITLE</a></span> - Static variable in class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository">ImageAlbumRepository</a></dt>
-<dd>
-<div class="block">Mapping to @NamedQuery 'find all image albums by title' defined in <a href="../NTNU/IDATT1002/models/ImageAlbum.html" title="class in NTNU.IDATT1002.models"><code>ImageAlbum</code></a></div>
-</dd>
-<dt><a href="../NTNU/IDATT1002/models/ImageAlbum.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">ImageAlbum</span></a> - Class in <a href="../NTNU/IDATT1002/models/package-summary.html">NTNU.IDATT1002.models</a></dt>
+<dt><a href="../NTNU/IDATT1002/models/Histogram.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Histogram</span></a> - Class in <a href="../NTNU/IDATT1002/models/package-summary.html">NTNU.IDATT1002.models</a></dt>
<dd>
-<div class="block">Class ImageAlbum representing an image album.</div>
+<div class="block">Creates histogram table</div>
</dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/ImageAlbum.html#%3Cinit%3E()">ImageAlbum()</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/ImageAlbum.html" title="class in NTNU.IDATT1002.models">ImageAlbum</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Histogram.html#%3Cinit%3E()">Histogram()</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a></dt>
<dd> </dd>
-<dt><a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">ImageAlbumRepository</span></a> - Class in <a href="../NTNU/IDATT1002/repository/package-summary.html">NTNU.IDATT1002.repository</a></dt>
-<dd>
-<div class="block">Image Album Repository.</div>
-</dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html#%3Cinit%3E(javax.persistence.EntityManager)">ImageAlbumRepository(EntityManager)</a></span> - Constructor for class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository">ImageAlbumRepository</a></dt>
+<dt><a href="../NTNU/IDATT1002/repository/HistorgramRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">HistorgramRepository</span></a> - Class in <a href="../NTNU/IDATT1002/repository/package-summary.html">NTNU.IDATT1002.repository</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/Authentication.html#isCorrectPassword(java.lang.String,java.lang.String)">isCorrectPassword(String, String)</a></span> - Static method in class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/Authentication.html" title="class in NTNU.IDATT1002.utils">Authentication</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/HistorgramRepository.html#%3Cinit%3E(javax.persistence.EntityManager)">HistorgramRepository(EntityManager)</a></span> - Constructor for class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/HistorgramRepository.html" title="class in NTNU.IDATT1002.repository">HistorgramRepository</a></dt>
<dd>
-<div class="block">Gets hash and salt from database with the username
- Hashes input password with same algorithm and salt as when created
- Compares the expected has and the new hash</div>
+<div class="block">Constructor to inject <code>EntityManager</code> dependency.</div>
</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/DataExchange.html#hostServices">hostServices</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></dt>
+<dd> </dd>
</dl>
-<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
</main>
<footer role="contentinfo">
<nav role="navigation">
diff --git a/javadoc/index-files/index-8.html b/javadoc/index-files/index-8.html
index c1873e0ab86d5a35bda9a5cbb5a4b39406df2431..d9adf76ab0cc7b723822a1b537f76d7e7acb88e9 100644
--- a/javadoc/index-files/index-8.html
+++ b/javadoc/index-files/index-8.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
-<title>L-Index</title>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>I-Index</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../script.js"></script>
@@ -22,7 +22,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="L-Index";
+ parent.document.title="I-Index";
}
}
catch(err) {
@@ -93,21 +93,88 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</nav>
</header>
<main role="main">
-<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:L">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:I">
<!-- -->
</a>
-<h2 class="title">L</h2>
+<h2 class="title">I</h2>
<dl>
-<dt><a href="../NTNU/IDATT1002/controllers/LoggedInController.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">LoggedInController</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
+<dt><a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Image</span></a> - Class in <a href="../NTNU/IDATT1002/models/package-summary.html">NTNU.IDATT1002.models</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/LoggedInController.html#%3Cinit%3E()">LoggedInController()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/LoggedInController.html" title="class in NTNU.IDATT1002.controllers">LoggedInController</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#%3Cinit%3E()">Image()</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
<dd> </dd>
-<dt><a href="../NTNU/IDATT1002/controllers/LoginController.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">LoginController</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Image.html#%3Cinit%3E(byte%5B%5D,NTNU.IDATT1002.models.Album,NTNU.IDATT1002.models.User,NTNU.IDATT1002.models.Metadata,java.lang.String)">Image(byte[], Album, User, Metadata, String)</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/LoginController.html#%3Cinit%3E()">LoginController()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/LoginController.html" title="class in NTNU.IDATT1002.controllers">LoginController</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/ImageRepository.html#IMAGE_FIND_BY_USERNAME">IMAGE_FIND_BY_USERNAME</a></span> - Static variable in class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/ImageRepository.html" title="class in NTNU.IDATT1002.repository">ImageRepository</a></dt>
+<dd>
+<div class="block">Mapping to @NamedQuery 'find all albums by users username' defined in <a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models"><code>Image</code></a></div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/CreateAlbum.html#image_grid">image_grid</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></dt>
<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/filters/ImageFilter.html" title="class in NTNU.IDATT1002.filters"><span class="typeNameLink">ImageFilter</span></a> - Class in <a href="../NTNU/IDATT1002/filters/package-summary.html">NTNU.IDATT1002.filters</a></dt>
+<dd>
+<div class="block">Album Filter.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/filters/ImageFilter.html#%3Cinit%3E()">ImageFilter()</a></span> - Constructor for class NTNU.IDATT1002.filters.<a href="../NTNU/IDATT1002/filters/ImageFilter.html" title="class in NTNU.IDATT1002.filters">ImageFilter</a></dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/repository/ImageRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">ImageRepository</span></a> - Class in <a href="../NTNU/IDATT1002/repository/package-summary.html">NTNU.IDATT1002.repository</a></dt>
+<dd>
+<div class="block">Image Repository.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/ImageRepository.html#%3Cinit%3E(javax.persistence.EntityManager)">ImageRepository(EntityManager)</a></span> - Constructor for class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/ImageRepository.html" title="class in NTNU.IDATT1002.repository">ImageRepository</a></dt>
+<dd>
+<div class="block">Constructor to inject <code>EntityManager</code> dependency.</div>
+</dd>
+<dt><a href="../NTNU/IDATT1002/service/ImageService.html" title="class in NTNU.IDATT1002.service"><span class="typeNameLink">ImageService</span></a> - Class in <a href="../NTNU/IDATT1002/service/package-summary.html">NTNU.IDATT1002.service</a></dt>
+<dd>
+<div class="block">Image service</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/ImageService.html#%3Cinit%3E(javax.persistence.EntityManager)">ImageService(EntityManager)</a></span> - Constructor for class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/ImageService.html" title="class in NTNU.IDATT1002.service">ImageService</a></dt>
+<dd>
+<div class="block">Inject entity manager instance to the repositories.</div>
+</dd>
+<dt><a href="../NTNU/IDATT1002/utils/ImageUtil.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">ImageUtil</span></a> - Class in <a href="../NTNU/IDATT1002/utils/package-summary.html">NTNU.IDATT1002.utils</a></dt>
+<dd>
+<div class="block">Image Util class for performing <a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models"><code>Image</code></a> related utility operations,
+ such as converting a file to a byte array and <a href="../NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models"><code>Image</code></a> to <code>Image</code>.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/ImageUtil.html#%3Cinit%3E()">ImageUtil()</a></span> - Constructor for class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/ImageUtil.html" title="class in NTNU.IDATT1002.utils">ImageUtil</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Explore.html#initialize(java.net.URL,java.util.ResourceBundle)">initialize(URL, ResourceBundle)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></dt>
+<dd>
+<div class="block">Method that runs when explore.fxml is set as scene
+ Generates content based on a list of images</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html#initialize(java.net.URL,java.util.ResourceBundle)">initialize(URL, ResourceBundle)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></dt>
+<dd>
+<div class="block">Initialize page with all albums.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Search.html#initialize(java.net.URL,java.util.ResourceBundle)">initialize(URL, ResourceBundle)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></dt>
+<dd>
+<div class="block">Method that writes the word that is searched for.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/UploadedSingle.html#initialize(java.net.URL,java.util.ResourceBundle)">initialize(URL, ResourceBundle)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></dt>
+<dd>
+<div class="block">Method that runs when the controller is loaded
+ Sets the image url on the page to be the uploaded images url</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#initialize(java.net.URL,java.util.ResourceBundle)">initialize(URL, ResourceBundle)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
+<dd>
+<div class="block">Initialize view with real album data.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewPicture.html#initialize(java.net.URL,java.util.ResourceBundle)">initialize(URL, ResourceBundle)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#isActive()">isActive()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/User.html#isAdmin()">isAdmin()</a></span> - Method in class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/Authentication.html#isCorrectPassword(java.lang.String,java.lang.String,java.lang.String)">isCorrectPassword(String, String, String)</a></span> - Static method in class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/Authentication.html" title="class in NTNU.IDATT1002.utils">Authentication</a></dt>
+<dd>
+<div class="block">Gets hash and salt from database with the salt
+ Hashes input password with same algorithm and salt as when created
+ Compares the expected has and the new hash</div>
+</dd>
</dl>
-<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
</main>
<footer role="contentinfo">
<nav role="navigation">
diff --git a/javadoc/index-files/index-9.html b/javadoc/index-files/index-9.html
index f0b3df6675c946dad0a3dff6340826726238d31d..c1a2293f4726059504d6c688145cae6fd4aa387c 100644
--- a/javadoc/index-files/index-9.html
+++ b/javadoc/index-files/index-9.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
-<title>M-Index</title>
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
+<title>L-Index</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="../script.js"></script>
@@ -22,7 +22,7 @@
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
- parent.document.title="M-Index";
+ parent.document.title="L-Index";
}
}
catch(err) {
@@ -93,21 +93,60 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
</nav>
</header>
<main role="main">
-<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:M">
+<div class="contentContainer"><a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a><a id="I:L">
<!-- -->
</a>
-<h2 class="title">M</h2>
+<h2 class="title">L</h2>
<dl>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/App.html#main(java.lang.String%5B%5D)">main(String[])</a></span> - Static method in class NTNU.IDATT1002.<a href="../NTNU/IDATT1002/App.html" title="class in NTNU.IDATT1002">App</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/database/LoadDatabase.html#load()">load()</a></span> - Static method in class NTNU.IDATT1002.database.<a href="../NTNU/IDATT1002/database/LoadDatabase.html" title="class in NTNU.IDATT1002.database">LoadDatabase</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/LoggedInController.html#main_upload">main_upload</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/LoggedInController.html" title="class in NTNU.IDATT1002.controllers">LoggedInController</a></dt>
+<dt><a href="../NTNU/IDATT1002/database/LoadDatabase.html" title="class in NTNU.IDATT1002.database"><span class="typeNameLink">LoadDatabase</span></a> - Class in <a href="../NTNU/IDATT1002/database/package-summary.html">NTNU.IDATT1002.database</a></dt>
+<dd>
+<div class="block">Loads test data into the database.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/database/LoadDatabase.html#%3Cinit%3E()">LoadDatabase()</a></span> - Constructor for class NTNU.IDATT1002.database.<a href="../NTNU/IDATT1002/database/LoadDatabase.html" title="class in NTNU.IDATT1002.database">LoadDatabase</a></dt>
<dd> </dd>
-<dt><a href="../NTNU/IDATT1002/utils/MultiplePhotos.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">MultiplePhotos</span></a> - Class in <a href="../NTNU/IDATT1002/utils/package-summary.html">NTNU.IDATT1002.utils</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#loadNextScrollbarView(javafx.event.ActionEvent)">loadNextScrollbarView(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
<dd> </dd>
-<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/utils/MultiplePhotos.html#%3Cinit%3E(java.util.ArrayList)">MultiplePhotos(ArrayList<File>)</a></span> - Constructor for class NTNU.IDATT1002.utils.<a href="../NTNU/IDATT1002/utils/MultiplePhotos.html" title="class in NTNU.IDATT1002.utils">MultiplePhotos</a></dt>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/ViewAlbum.html#loadPreviousScrollbarView(javafx.event.ActionEvent)">loadPreviousScrollbarView(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></dt>
<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Login.html#login">login</a></span> - Variable in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Login.html" title="class in NTNU.IDATT1002.controllers">Login</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Login.html#login(javafx.event.ActionEvent)">login(ActionEvent)</a></span> - Method in class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Login.html" title="class in NTNU.IDATT1002.controllers">Login</a></dt>
+<dd>
+<div class="block">Method that changes scene to Main page</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/service/UserService.html#logIn(java.lang.String,java.lang.String)">logIn(String, String)</a></span> - Method in class NTNU.IDATT1002.service.<a href="../NTNU/IDATT1002/service/UserService.html" title="class in NTNU.IDATT1002.service">UserService</a></dt>
+<dd>
+<div class="block">Logs a user in if correct credentials is given</div>
+</dd>
+<dt><a href="../NTNU/IDATT1002/controllers/Login.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Login</span></a> - Class in <a href="../NTNU/IDATT1002/controllers/package-summary.html">NTNU.IDATT1002.controllers</a></dt>
+<dd>
+<div class="block">Controls the buttons and changeable elements on login.fxml,
+ the page where you log into the application</div>
+</dd>
+<dt><a href="../NTNU/IDATT1002/models/Login.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Login</span></a> - Class in <a href="../NTNU/IDATT1002/models/package-summary.html">NTNU.IDATT1002.models</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/controllers/Login.html#%3Cinit%3E()">Login()</a></span> - Constructor for class NTNU.IDATT1002.controllers.<a href="../NTNU/IDATT1002/controllers/Login.html" title="class in NTNU.IDATT1002.controllers">Login</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Login.html#%3Cinit%3E()">Login()</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Login.html" title="class in NTNU.IDATT1002.models">Login</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Login.html#%3Cinit%3E(NTNU.IDATT1002.models.User)">Login(User)</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Login.html" title="class in NTNU.IDATT1002.models">Login</a></dt>
+<dd> </dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/models/Login.html#%3Cinit%3E(NTNU.IDATT1002.models.User,java.lang.String,java.lang.String)">Login(User, String, String)</a></span> - Constructor for class NTNU.IDATT1002.models.<a href="../NTNU/IDATT1002/models/Login.html" title="class in NTNU.IDATT1002.models">Login</a></dt>
+<dd> </dd>
+<dt><a href="../NTNU/IDATT1002/repository/LoginRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">LoginRepository</span></a> - Class in <a href="../NTNU/IDATT1002/repository/package-summary.html">NTNU.IDATT1002.repository</a></dt>
+<dd>
+<div class="block">Login Repository
+
+ Implements <a href="../NTNU/IDATT1002/repository/Repository.html" title="interface in NTNU.IDATT1002.repository"><code>Repository</code></a> whick supports CRUD operations.</div>
+</dd>
+<dt><span class="memberNameLink"><a href="../NTNU/IDATT1002/repository/LoginRepository.html#%3Cinit%3E(javax.persistence.EntityManager)">LoginRepository(EntityManager)</a></span> - Constructor for class NTNU.IDATT1002.repository.<a href="../NTNU/IDATT1002/repository/LoginRepository.html" title="class in NTNU.IDATT1002.repository">LoginRepository</a></dt>
+<dd>
+<div class="block">Constructor to inject <code>EntityManager</code> dependency and sets the class type to <a href="../NTNU/IDATT1002/models/Login.html" title="class in NTNU.IDATT1002.models"><code>Login</code></a></div>
+</dd>
</dl>
-<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">I</a> <a href="index-8.html">L</a> <a href="index-9.html">M</a> <a href="index-10.html">N</a> <a href="index-11.html">R</a> <a href="index-12.html">S</a> <a href="index-13.html">T</a> <a href="index-14.html">U</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
+<a href="index-1.html">A</a> <a href="index-2.html">C</a> <a href="index-3.html">D</a> <a href="index-4.html">E</a> <a href="index-5.html">F</a> <a href="index-6.html">G</a> <a href="index-7.html">H</a> <a href="index-8.html">I</a> <a href="index-9.html">L</a> <a href="index-10.html">M</a> <a href="index-11.html">N</a> <a href="index-12.html">O</a> <a href="index-13.html">P</a> <a href="index-14.html">R</a> <a href="index-15.html">S</a> <a href="index-16.html">T</a> <a href="index-17.html">U</a> <a href="index-18.html">V</a> <br><a href="../allclasses-index.html">All Classes</a> <a href="../allpackages-index.html">All Packages</a></div>
</main>
<footer role="contentinfo">
<nav role="navigation">
diff --git a/javadoc/index.html b/javadoc/index.html
index 02d34809e7f84457b39c0ddd8b69e3019201d1dd..8b823fa40918e68c72542f68a11cafa307498dad 100644
--- a/javadoc/index.html
+++ b/javadoc/index.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>Overview</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
@@ -110,14 +110,26 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<td class="colLast"> </td>
</tr>
<tr class="altColor" id="i2">
-<th class="colFirst" scope="row"><a href="NTNU/IDATT1002/models/package-summary.html">NTNU.IDATT1002.models</a></th>
+<th class="colFirst" scope="row"><a href="NTNU/IDATT1002/database/package-summary.html">NTNU.IDATT1002.database</a></th>
<td class="colLast"> </td>
</tr>
<tr class="rowColor" id="i3">
-<th class="colFirst" scope="row"><a href="NTNU/IDATT1002/repository/package-summary.html">NTNU.IDATT1002.repository</a></th>
+<th class="colFirst" scope="row"><a href="NTNU/IDATT1002/filters/package-summary.html">NTNU.IDATT1002.filters</a></th>
<td class="colLast"> </td>
</tr>
<tr class="altColor" id="i4">
+<th class="colFirst" scope="row"><a href="NTNU/IDATT1002/models/package-summary.html">NTNU.IDATT1002.models</a></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor" id="i5">
+<th class="colFirst" scope="row"><a href="NTNU/IDATT1002/repository/package-summary.html">NTNU.IDATT1002.repository</a></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="altColor" id="i6">
+<th class="colFirst" scope="row"><a href="NTNU/IDATT1002/service/package-summary.html">NTNU.IDATT1002.service</a></th>
+<td class="colLast"> </td>
+</tr>
+<tr class="rowColor" id="i7">
<th class="colFirst" scope="row"><a href="NTNU/IDATT1002/utils/package-summary.html">NTNU.IDATT1002.utils</a></th>
<td class="colLast"> </td>
</tr>
diff --git a/javadoc/member-search-index.js b/javadoc/member-search-index.js
index baedcf9267a6331ad2ae67aaec5cfb43e239dea5..4eb1830316ad2baf70f51cc09bb29c3759866c09 100644
--- a/javadoc/member-search-index.js
+++ b/javadoc/member-search-index.js
@@ -1 +1 @@
-memberSearchIndex = [{"p":"NTNU.IDATT1002.models","c":"User","l":"addImageAlbum(ImageAlbum)","url":"addImageAlbum(NTNU.IDATT1002.models.ImageAlbum)"},{"p":"NTNU.IDATT1002","c":"App","l":"App()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.utils","c":"Authentication","l":"Authentication()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.repository","c":"ImageAlbumRepository","l":"count()"},{"p":"NTNU.IDATT1002.repository","c":"Repository","l":"count()"},{"p":"NTNU.IDATT1002.utils","c":"CreateUser","l":"CreateUser()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.repository","c":"ImageAlbumRepository","l":"delete(ImageAlbum)","url":"delete(NTNU.IDATT1002.models.ImageAlbum)"},{"p":"NTNU.IDATT1002.repository","c":"Repository","l":"delete(T)"},{"p":"NTNU.IDATT1002.repository","c":"Repository","l":"deleteById(ID)"},{"p":"NTNU.IDATT1002.repository","c":"ImageAlbumRepository","l":"deleteById(Long)","url":"deleteById(java.lang.Long)"},{"p":"NTNU.IDATT1002.models","c":"ImageAlbum","l":"equals(Object)","url":"equals(java.lang.Object)"},{"p":"NTNU.IDATT1002.repository","c":"ImageAlbumRepository","l":"exists(ImageAlbum)","url":"exists(NTNU.IDATT1002.models.ImageAlbum)"},{"p":"NTNU.IDATT1002.repository","c":"Repository","l":"exists(T)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreController","l":"ExploreController()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.utils","c":"ExtractMetaData","l":"ExtractMetaData(File)","url":"%3Cinit%3E(java.io.File)"},{"p":"NTNU.IDATT1002.repository","c":"ImageAlbumRepository","l":"findAll()"},{"p":"NTNU.IDATT1002.repository","c":"Repository","l":"findAll()"},{"p":"NTNU.IDATT1002.repository","c":"ImageAlbumRepository","l":"findAllByTitle(String)","url":"findAllByTitle(java.lang.String)"},{"p":"NTNU.IDATT1002.repository","c":"Repository","l":"findById(ID)"},{"p":"NTNU.IDATT1002.repository","c":"ImageAlbumRepository","l":"findById(Long)","url":"findById(java.lang.Long)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreController","l":"footer_next_page"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreController","l":"footer_previous_page"},{"p":"NTNU.IDATT1002.utils","c":"ExtractMetaData","l":"getAll()"},{"p":"NTNU.IDATT1002.models","c":"ImageAlbum","l":"getId()"},{"p":"NTNU.IDATT1002.utils","c":"ExtractMetaData","l":"getNecessary()"},{"p":"NTNU.IDATT1002.repository","c":"ImageAlbumRepository","l":"IMAGE_ALBUM_FIND_BY_TITLE"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"Image()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.models","c":"ImageAlbum","l":"ImageAlbum()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.repository","c":"ImageAlbumRepository","l":"ImageAlbumRepository(EntityManager)","url":"%3Cinit%3E(javax.persistence.EntityManager)"},{"p":"NTNU.IDATT1002.utils","c":"Authentication","l":"isCorrectPassword(String, String)","url":"isCorrectPassword(java.lang.String,java.lang.String)"},{"p":"NTNU.IDATT1002.controllers","c":"LoggedInController","l":"LoggedInController()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.controllers","c":"LoginController","l":"LoginController()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.controllers","c":"LoggedInController","l":"main_upload"},{"p":"NTNU.IDATT1002","c":"App","l":"main(String[])","url":"main(java.lang.String[])"},{"p":"NTNU.IDATT1002.utils","c":"MultiplePhotos","l":"MultiplePhotos(ArrayList<File>)","url":"%3Cinit%3E(java.util.ArrayList)"},{"p":"NTNU.IDATT1002.utils","c":"Authentication","l":"r"},{"p":"NTNU.IDATT1002.models","c":"User","l":"removeImageAlbum(ImageAlbum)","url":"removeImageAlbum(NTNU.IDATT1002.models.ImageAlbum)"},{"p":"NTNU.IDATT1002.repository","c":"ImageAlbumRepository","l":"save(ImageAlbum)","url":"save(NTNU.IDATT1002.models.ImageAlbum)"},{"p":"NTNU.IDATT1002.repository","c":"Repository","l":"save(T)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreController","l":"scrollpane"},{"p":"NTNU.IDATT1002.models","c":"ImageAlbum","l":"setId(Long)","url":"setId(java.lang.Long)"},{"p":"NTNU.IDATT1002.utils","c":"Authentication","l":"setPassword(String, String)","url":"setPassword(java.lang.String,java.lang.String)"},{"p":"NTNU.IDATT1002","c":"App","l":"setRoot(String)","url":"setRoot(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"ImageAlbum","l":"setTitle(String)","url":"setTitle(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"ImageAlbum","l":"setUser(User)","url":"setUser(NTNU.IDATT1002.models.User)"},{"p":"NTNU.IDATT1002.controllers","c":"SignUpController","l":"SignUpController()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002","c":"App","l":"start(Stage)","url":"start(javafx.stage.Stage)"},{"p":"NTNU.IDATT1002.controllers","c":"LoggedInController","l":"switchToExplore(ActionEvent)","url":"switchToExplore(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"LoginController","l":"switchToLoggedIn(ActionEvent)","url":"switchToLoggedIn(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreController","l":"switchToMain(MouseEvent)","url":"switchToMain(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreController","l":"switchToMap(ActionEvent)","url":"switchToMap(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"LoggedInController","l":"switchToMap(ActionEvent)","url":"switchToMap(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreController","l":"switchToNext(ActionEvent)","url":"switchToNext(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreController","l":"switchToPrevious(ActionEvent)","url":"switchToPrevious(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"SignUpController","l":"switchToPrimary()"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreController","l":"switchToSearch(ActionEvent)","url":"switchToSearch(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"LoggedInController","l":"switchToSearch(ActionEvent)","url":"switchToSearch(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"LoginController","l":"switchToSecondary()"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreController","l":"switchToUpload(ActionEvent)","url":"switchToUpload(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"LoggedInController","l":"switchToUpload(ActionEvent)","url":"switchToUpload(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"LoggedInController","l":"tbar_explore"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreController","l":"tbar_logo"},{"p":"NTNU.IDATT1002.controllers","c":"LoggedInController","l":"tbar_logo"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreController","l":"tbar_map"},{"p":"NTNU.IDATT1002.controllers","c":"LoggedInController","l":"tbar_map"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreController","l":"tbar_search"},{"p":"NTNU.IDATT1002.controllers","c":"LoggedInController","l":"tbar_search"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreController","l":"tbar_upload"},{"p":"NTNU.IDATT1002.controllers","c":"LoggedInController","l":"tbar_upload"},{"p":"NTNU.IDATT1002.models","c":"User","l":"User()","url":"%3Cinit%3E()"}]
\ No newline at end of file
+memberSearchIndex = [{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"acceptBtn"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"acceptBtn"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"acceptDrop(DragEvent)","url":"acceptDrop(javafx.scene.input.DragEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"add_images_button"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"addAlbum(Album)","url":"addAlbum(NTNU.IDATT1002.models.Album)"},{"p":"NTNU.IDATT1002.models","c":"User","l":"addAlbum(Album)","url":"addAlbum(NTNU.IDATT1002.models.Album)"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"addImage(Image)","url":"addImage(NTNU.IDATT1002.models.Image)"},{"p":"NTNU.IDATT1002.models","c":"User","l":"addImage(Image)","url":"addImage(NTNU.IDATT1002.models.Image)"},{"p":"NTNU.IDATT1002.service","c":"AlbumService","l":"addImageToAlbum(Album, Image)","url":"addImageToAlbum(NTNU.IDATT1002.models.Album,NTNU.IDATT1002.models.Image)"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"addTag(Tag)","url":"addTag(NTNU.IDATT1002.models.Tag)"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"addTag(Tag)","url":"addTag(NTNU.IDATT1002.models.Tag)"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"addTags(ArrayList<Tag>)","url":"addTags(java.util.ArrayList)"},{"p":"NTNU.IDATT1002.service","c":"AlbumService","l":"addTagToAlbum(Album, Tag)","url":"addTagToAlbum(NTNU.IDATT1002.models.Album,NTNU.IDATT1002.models.Tag)"},{"p":"NTNU.IDATT1002.service","c":"ImageService","l":"addTagToImage(Image, Tag)","url":"addTagToImage(NTNU.IDATT1002.models.Image,NTNU.IDATT1002.models.Tag)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"album_authorField"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"album_desc_field"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"album_descField"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"album_fields_grid_pane"},{"p":"NTNU.IDATT1002.repository","c":"AlbumRepository","l":"ALBUM_FIND_BY_USERNAME"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"album_tag_field"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"album_tagsField"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"album_title_field"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"album_titleField"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"Album()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"albumAmount"},{"p":"NTNU.IDATT1002.filters","c":"AlbumFilter","l":"AlbumFilter()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"albumImage"},{"p":"NTNU.IDATT1002.repository","c":"AlbumRepository","l":"AlbumRepository(EntityManager)","url":"%3Cinit%3E(javax.persistence.EntityManager)"},{"p":"NTNU.IDATT1002.service","c":"AlbumService","l":"AlbumService(EntityManager)","url":"%3Cinit%3E(javax.persistence.EntityManager)"},{"p":"NTNU.IDATT1002","c":"App","l":"App()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002","c":"ApplicationState","l":"ApplicationState()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.utils","c":"Authentication","l":"Authentication()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"changeMainPicture1(MouseEvent)","url":"changeMainPicture1(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"changeMainPicture2(MouseEvent)","url":"changeMainPicture2(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"changeMainPicture3(MouseEvent)","url":"changeMainPicture3(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"changeMainPicture4(MouseEvent)","url":"changeMainPicture4(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"changeMainPicture5(MouseEvent)","url":"changeMainPicture5(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"changeMainPicture6(MouseEvent)","url":"changeMainPicture6(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"chooseFile()"},{"p":"NTNU.IDATT1002.utils","c":"ImageUtil","l":"convertToBytes(String)","url":"convertToBytes(java.lang.String)"},{"p":"NTNU.IDATT1002.utils","c":"ImageUtil","l":"convertToFXImage(Image)","url":"convertToFXImage(NTNU.IDATT1002.models.Image)"},{"p":"NTNU.IDATT1002.repository","c":"Repository","l":"count()"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"create_album_button"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"create_album_document"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"CreateAlbum()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.service","c":"AlbumService","l":"createAlbum(String, String, User, List<Tag>, List<Image>)","url":"createAlbum(java.lang.String,java.lang.String,NTNU.IDATT1002.models.User,java.util.List,java.util.List)"},{"p":"NTNU.IDATT1002.service","c":"AlbumService","l":"createAlbum(String, String, User, String)","url":"createAlbum(java.lang.String,java.lang.String,NTNU.IDATT1002.models.User,java.lang.String)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"createAlbumButton"},{"p":"NTNU.IDATT1002.service","c":"AlbumDocument","l":"createDocument()"},{"p":"NTNU.IDATT1002.service","c":"PdfDocument","l":"createDocument()"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"createDocument(ActionEvent)","url":"createDocument(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"createEmptyAlbum(ActionEvent)","url":"createEmptyAlbum(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.service","c":"ImageService","l":"createImage(User, File, ArrayList<Tag>)","url":"createImage(NTNU.IDATT1002.models.User,java.io.File,java.util.ArrayList)"},{"p":"NTNU.IDATT1002.service","c":"UserService","l":"createUser(String, String, String, String, String, String, Date, String)","url":"createUser(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.util.Date,java.lang.String)"},{"p":"NTNU.IDATT1002.controllers","c":"DataExchange","l":"DataExchange()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.repository","c":"Repository","l":"delete(T)"},{"p":"NTNU.IDATT1002.repository","c":"Repository","l":"deleteById(ID)"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"drag_drop"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"droppedFiles(DragEvent)","url":"droppedFiles(javafx.scene.input.DragEvent)"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"equals(Object)","url":"equals(java.lang.Object)"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"equals(Object)","url":"equals(java.lang.Object)"},{"p":"NTNU.IDATT1002.models","c":"Tag","l":"equals(Object)","url":"equals(java.lang.Object)"},{"p":"NTNU.IDATT1002.models","c":"User","l":"equals(Object)","url":"equals(java.lang.Object)"},{"p":"NTNU.IDATT1002","c":"App","l":"ex"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"Explore()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"ExploreAlbums()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.filters","c":"AlbumFilter","l":"filter(String)","url":"filter(java.lang.String)"},{"p":"NTNU.IDATT1002.filters","c":"ImageFilter","l":"filter(String)","url":"filter(java.lang.String)"},{"p":"NTNU.IDATT1002.repository","c":"Repository","l":"findAll()"},{"p":"NTNU.IDATT1002.repository","c":"AlbumRepository","l":"findAllByUsername(String)","url":"findAllByUsername(java.lang.String)"},{"p":"NTNU.IDATT1002.repository","c":"ImageRepository","l":"findAllByUsername(String)","url":"findAllByUsername(java.lang.String)"},{"p":"NTNU.IDATT1002.repository","c":"Repository","l":"findById(ID)"},{"p":"NTNU.IDATT1002.repository","c":"MetadataRepository","l":"findOrCreate(Metadata)","url":"findOrCreate(NTNU.IDATT1002.models.Metadata)"},{"p":"NTNU.IDATT1002.repository","c":"TagRepository","l":"findOrCreate(Tag)","url":"findOrCreate(NTNU.IDATT1002.models.Tag)"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"footer_nextBtn"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"footer_previousBtn"},{"p":"NTNU.IDATT1002.models","c":"GeoLocation","l":"GeoLocation()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.models","c":"GeoLocation","l":"GeoLocation(String, String)","url":"%3Cinit%3E(java.lang.String,java.lang.String)"},{"p":"NTNU.IDATT1002.repository","c":"GeoLocatioRepository","l":"GeoLocatioRepository(EntityManager)","url":"%3Cinit%3E(javax.persistence.EntityManager)"},{"p":"NTNU.IDATT1002.service","c":"AlbumService","l":"getAlbumById(Long)","url":"getAlbumById(java.lang.Long)"},{"p":"NTNU.IDATT1002.service","c":"AlbumService","l":"getAlbumFromUser(User)","url":"getAlbumFromUser(NTNU.IDATT1002.models.User)"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"getAlbums()"},{"p":"NTNU.IDATT1002.service","c":"AlbumService","l":"getAllAlbums()"},{"p":"NTNU.IDATT1002.service","c":"ImageService","l":"getAllImages()"},{"p":"NTNU.IDATT1002.models","c":"User","l":"getBirthDate()"},{"p":"NTNU.IDATT1002.models","c":"User","l":"getCallingCode()"},{"p":"NTNU.IDATT1002.controllers","c":"DataExchange","l":"getChosenAlbumId()"},{"p":"NTNU.IDATT1002.controllers","c":"DataExchange","l":"getChosenImg()"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"getCreatedAt()"},{"p":"NTNU.IDATT1002","c":"ApplicationState","l":"getCurrentUser()"},{"p":"NTNU.IDATT1002.models","c":"Histogram","l":"getData()"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"getDescription()"},{"p":"NTNU.IDATT1002.service","c":"AlbumDocument","l":"getDocument()"},{"p":"NTNU.IDATT1002.service","c":"PdfDocument","l":"getDocument()"},{"p":"NTNU.IDATT1002.service","c":"AlbumService","l":"getDocument(Long)","url":"getDocument(java.lang.Long)"},{"p":"NTNU.IDATT1002.models","c":"User","l":"getEmail()"},{"p":"NTNU.IDATT1002.controllers","c":"DataExchange","l":"getEntityManager()"},{"p":"NTNU.IDATT1002.database","c":"EntityManagerConfig","l":"getEntityManager()"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"getExtension(String)","url":"getExtension(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"User","l":"getFirstName()"},{"p":"NTNU.IDATT1002.models","c":"Metadata","l":"getGeoLocation()"},{"p":"NTNU.IDATT1002.utils","c":"MetaDataExtractor","l":"getGeoLocation(File)","url":"getGeoLocation(java.io.File)"},{"p":"NTNU.IDATT1002.models","c":"GeoLocation","l":"getGeoLocationId()"},{"p":"NTNU.IDATT1002.models","c":"Login","l":"getHash()"},{"p":"NTNU.IDATT1002.models","c":"Metadata","l":"getHistogram()"},{"p":"NTNU.IDATT1002.utils","c":"MetaDataExtractor","l":"getHistogram(File)","url":"getHistogram(java.io.File)"},{"p":"NTNU.IDATT1002.models","c":"Histogram","l":"getHistogramId()"},{"p":"NTNU.IDATT1002.controllers","c":"DataExchange","l":"getHostServices()"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"getId()"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"getId()"},{"p":"NTNU.IDATT1002.models","c":"Metadata","l":"getImage()"},{"p":"NTNU.IDATT1002.service","c":"ImageService","l":"getImageFromUser(User)","url":"getImageFromUser(NTNU.IDATT1002.models.User)"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"getImages()"},{"p":"NTNU.IDATT1002.models","c":"User","l":"getLastName()"},{"p":"NTNU.IDATT1002.models","c":"GeoLocation","l":"getLatitude()"},{"p":"NTNU.IDATT1002.models","c":"GeoLocation","l":"getLongitude()"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"getMetadata()"},{"p":"NTNU.IDATT1002.models","c":"Metadata","l":"getMetadataId()"},{"p":"NTNU.IDATT1002.models","c":"Tag","l":"getName()"},{"p":"NTNU.IDATT1002.models","c":"Login","l":"getPasswordSalt()"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"getPath()"},{"p":"NTNU.IDATT1002.models","c":"User","l":"getPhoneNumber()"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"getRawImage()"},{"p":"NTNU.IDATT1002.controllers","c":"DataExchange","l":"getSearchField()"},{"p":"NTNU.IDATT1002.models","c":"Tag","l":"getTagId()"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"getTags()"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"getTags()"},{"p":"NTNU.IDATT1002.service","c":"TagService","l":"getTagsAsString(List<Tag>)","url":"getTagsAsString(java.util.List)"},{"p":"NTNU.IDATT1002.service","c":"TagService","l":"getTagsFromString(String)","url":"getTagsFromString(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"getTitle()"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"getUpdatedAt()"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"getUploadedAt()"},{"p":"NTNU.IDATT1002.controllers","c":"DataExchange","l":"getUploadedFiles()"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"getUser()"},{"p":"NTNU.IDATT1002.models","c":"Login","l":"getUser()"},{"p":"NTNU.IDATT1002.models","c":"User","l":"getUsername()"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"gridPane"},{"p":"NTNU.IDATT1002.models","c":"Histogram","l":"Histogram()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.repository","c":"HistorgramRepository","l":"HistorgramRepository(EntityManager)","url":"%3Cinit%3E(javax.persistence.EntityManager)"},{"p":"NTNU.IDATT1002.controllers","c":"DataExchange","l":"hostServices"},{"p":"NTNU.IDATT1002.repository","c":"ImageRepository","l":"IMAGE_FIND_BY_USERNAME"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"image_grid"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"Image()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"Image(byte[], Album, User, Metadata, String)","url":"%3Cinit%3E(byte[],NTNU.IDATT1002.models.Album,NTNU.IDATT1002.models.User,NTNU.IDATT1002.models.Metadata,java.lang.String)"},{"p":"NTNU.IDATT1002.filters","c":"ImageFilter","l":"ImageFilter()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.repository","c":"ImageRepository","l":"ImageRepository(EntityManager)","url":"%3Cinit%3E(javax.persistence.EntityManager)"},{"p":"NTNU.IDATT1002.service","c":"ImageService","l":"ImageService(EntityManager)","url":"%3Cinit%3E(javax.persistence.EntityManager)"},{"p":"NTNU.IDATT1002.utils","c":"ImageUtil","l":"ImageUtil()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"initialize(URL, ResourceBundle)","url":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"initialize(URL, ResourceBundle)","url":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"initialize(URL, ResourceBundle)","url":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"initialize(URL, ResourceBundle)","url":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"initialize(URL, ResourceBundle)","url":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"initialize(URL, ResourceBundle)","url":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"NTNU.IDATT1002.models","c":"User","l":"isActive()"},{"p":"NTNU.IDATT1002.models","c":"User","l":"isAdmin()"},{"p":"NTNU.IDATT1002.utils","c":"Authentication","l":"isCorrectPassword(String, String, String)","url":"isCorrectPassword(java.lang.String,java.lang.String,java.lang.String)"},{"p":"NTNU.IDATT1002.database","c":"LoadDatabase","l":"load()"},{"p":"NTNU.IDATT1002.database","c":"LoadDatabase","l":"LoadDatabase()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"loadNextScrollbarView(ActionEvent)","url":"loadNextScrollbarView(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"loadPreviousScrollbarView(ActionEvent)","url":"loadPreviousScrollbarView(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Login","l":"login"},{"p":"NTNU.IDATT1002.controllers","c":"Login","l":"Login()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.models","c":"Login","l":"Login()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.controllers","c":"Login","l":"login(ActionEvent)","url":"login(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.service","c":"UserService","l":"logIn(String, String)","url":"logIn(java.lang.String,java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"Login","l":"Login(User, String, String)","url":"%3Cinit%3E(NTNU.IDATT1002.models.User,java.lang.String,java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"Login","l":"Login(User)","url":"%3Cinit%3E(NTNU.IDATT1002.models.User)"},{"p":"NTNU.IDATT1002.repository","c":"LoginRepository","l":"LoginRepository(EntityManager)","url":"%3Cinit%3E(javax.persistence.EntityManager)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"main_picture"},{"p":"NTNU.IDATT1002.controllers","c":"Main","l":"Main()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002","c":"App","l":"main(String[])","url":"main(java.lang.String[])"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"Map()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"MapSearch(ActionEvent)","url":"MapSearch(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"metadata_pane"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"metadata_pane"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"metadata_pane"},{"p":"NTNU.IDATT1002.models","c":"Metadata","l":"Metadata()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.models","c":"Metadata","l":"Metadata(Image, GeoLocation, Histogram)","url":"%3Cinit%3E(NTNU.IDATT1002.models.Image,NTNU.IDATT1002.models.GeoLocation,NTNU.IDATT1002.models.Histogram)"},{"p":"NTNU.IDATT1002.utils","c":"MetaDataExtractor","l":"MetaDataExtractor()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.repository","c":"MetadataRepository","l":"MetadataRepository(EntityManager)","url":"%3Cinit%3E(javax.persistence.EntityManager)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"openPopUpPicture(MouseEvent)","url":"openPopUpPicture(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"openPopUpPicture(MouseEvent)","url":"openPopUpPicture(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Login","l":"Password"},{"p":"NTNU.IDATT1002.service","c":"PdfDocument","l":"PdfDocument(Album, String)","url":"%3Cinit%3E(NTNU.IDATT1002.models.Album,java.lang.String)"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"photo_desc"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"photo_desc"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"photo_desc2"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"photo_desc3"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"photo_desc4"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"photo_image"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"photo_image"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"photo_image2"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"photo_image3"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"photo_image4"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"photo_tag"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"photo_tag"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"photo_tag2"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"photo_tag3"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"photo_tag4"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"photo_title"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"photo_title"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"photo_title2"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"photo_title3"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"photo_title4"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"picture"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"picture_descField"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"picture_tagsField"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"picture_tagsField"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"picture_title_field"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"picture_title_field"},{"p":"NTNU.IDATT1002.utils","c":"Authentication","l":"r"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"removeAlbum(Album)","url":"removeAlbum(NTNU.IDATT1002.models.Album)"},{"p":"NTNU.IDATT1002.models","c":"User","l":"removeAlbum(Album)","url":"removeAlbum(NTNU.IDATT1002.models.Album)"},{"p":"NTNU.IDATT1002.models","c":"User","l":"removeAlbum(Image)","url":"removeAlbum(NTNU.IDATT1002.models.Image)"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"removeImage(Image)","url":"removeImage(NTNU.IDATT1002.models.Image)"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"removeTag(Tag)","url":"removeTag(NTNU.IDATT1002.models.Tag)"},{"p":"NTNU.IDATT1002.repository","c":"Repository","l":"save(T)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"scroll_button_next"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"scroll_button_previous"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"scroll_picture1"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"scroll_picture2"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"scroll_picture3"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"scroll_picture4"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"scroll_picture5"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"scroll_picture6"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"scrollpane"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"scrollpane"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"scrollPane"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"search"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"search_result"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"Search()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.service","c":"AlbumService","l":"searchAlbums(String)","url":"searchAlbums(java.lang.String)"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"searchBtn"},{"p":"NTNU.IDATT1002.service","c":"ImageService","l":"searchImages(String)","url":"searchImages(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"User","l":"setBirthDate(Date)","url":"setBirthDate(java.util.Date)"},{"p":"NTNU.IDATT1002.models","c":"User","l":"setCallingCode(String)","url":"setCallingCode(java.lang.String)"},{"p":"NTNU.IDATT1002.controllers","c":"DataExchange","l":"setChosenAlbumId(Long)","url":"setChosenAlbumId(java.lang.Long)"},{"p":"NTNU.IDATT1002.controllers","c":"DataExchange","l":"setChosenImg(String)","url":"setChosenImg(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"setCreatedAt(Date)","url":"setCreatedAt(java.util.Date)"},{"p":"NTNU.IDATT1002","c":"ApplicationState","l":"setCurrentUser(User)","url":"setCurrentUser(NTNU.IDATT1002.models.User)"},{"p":"NTNU.IDATT1002.models","c":"Histogram","l":"setData(String)","url":"setData(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"setDescription(String)","url":"setDescription(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"User","l":"setEmail(String)","url":"setEmail(java.lang.String)"},{"p":"NTNU.IDATT1002.controllers","c":"DataExchange","l":"setEntityManager(EntityManager)","url":"setEntityManager(javax.persistence.EntityManager)"},{"p":"NTNU.IDATT1002.models","c":"User","l":"setFirstName(String)","url":"setFirstName(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"Metadata","l":"setGeoLocation(GeoLocation)","url":"setGeoLocation(NTNU.IDATT1002.models.GeoLocation)"},{"p":"NTNU.IDATT1002.models","c":"GeoLocation","l":"setGeoLocationId(Long)","url":"setGeoLocationId(java.lang.Long)"},{"p":"NTNU.IDATT1002.models","c":"Login","l":"setHash(String)","url":"setHash(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"Metadata","l":"setHistogram(Histogram)","url":"setHistogram(NTNU.IDATT1002.models.Histogram)"},{"p":"NTNU.IDATT1002.models","c":"Histogram","l":"setHistogramId(Long)","url":"setHistogramId(java.lang.Long)"},{"p":"NTNU.IDATT1002.controllers","c":"DataExchange","l":"setHostServices(HostServices)","url":"setHostServices(javafx.application.HostServices)"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"setId(Long)","url":"setId(java.lang.Long)"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"setId(Long)","url":"setId(java.lang.Long)"},{"p":"NTNU.IDATT1002.models","c":"Metadata","l":"setImage(Image)","url":"setImage(NTNU.IDATT1002.models.Image)"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"setImages(List<Image>)","url":"setImages(java.util.List)"},{"p":"NTNU.IDATT1002.models","c":"User","l":"setLastName(String)","url":"setLastName(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"GeoLocation","l":"setLatitude(String)","url":"setLatitude(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"GeoLocation","l":"setLongitude(String)","url":"setLongitude(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"GeoLocation","l":"setMetadata(Metadata)","url":"setMetadata(NTNU.IDATT1002.models.Metadata)"},{"p":"NTNU.IDATT1002.models","c":"Histogram","l":"setMetadata(Metadata)","url":"setMetadata(NTNU.IDATT1002.models.Metadata)"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"setMetadata(Metadata)","url":"setMetadata(NTNU.IDATT1002.models.Metadata)"},{"p":"NTNU.IDATT1002.models","c":"Tag","l":"setName(String)","url":"setName(java.lang.String)"},{"p":"NTNU.IDATT1002.utils","c":"Authentication","l":"setPassword(String)","url":"setPassword(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"Login","l":"setPasswordSalt(String)","url":"setPasswordSalt(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"setPath(String)","url":"setPath(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"User","l":"setPhoneNumber(String)","url":"setPhoneNumber(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"setRawImage(byte[])"},{"p":"NTNU.IDATT1002","c":"App","l":"setRoot(String)","url":"setRoot(java.lang.String)"},{"p":"NTNU.IDATT1002.controllers","c":"DataExchange","l":"setSearchField(String)","url":"setSearchField(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"Tag","l":"setTagId(Long)","url":"setTagId(java.lang.Long)"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"setTags(List<Tag>)","url":"setTags(java.util.List)"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"setText(String, int, int, double, String, double)","url":"setText(java.lang.String,int,int,double,java.lang.String,double)"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"setText(String, int, int, String, double)","url":"setText(java.lang.String,int,int,java.lang.String,double)"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"setTitle(String)","url":"setTitle(java.lang.String)"},{"p":"NTNU.IDATT1002.controllers","c":"DataExchange","l":"setUploadedFiles(List<File>)","url":"setUploadedFiles(java.util.List)"},{"p":"NTNU.IDATT1002.models","c":"Album","l":"setUser(User)","url":"setUser(NTNU.IDATT1002.models.User)"},{"p":"NTNU.IDATT1002.models","c":"Image","l":"setUser(User)","url":"setUser(NTNU.IDATT1002.models.User)"},{"p":"NTNU.IDATT1002.models","c":"Login","l":"setUser(User)","url":"setUser(NTNU.IDATT1002.models.User)"},{"p":"NTNU.IDATT1002.models","c":"User","l":"setUsername(String)","url":"setUsername(java.lang.String)"},{"p":"NTNU.IDATT1002.controllers","c":"Login","l":"signup"},{"p":"NTNU.IDATT1002.controllers","c":"SignUp","l":"signup_birthDate"},{"p":"NTNU.IDATT1002.controllers","c":"SignUp","l":"signup_btn"},{"p":"NTNU.IDATT1002.controllers","c":"SignUp","l":"signup_email"},{"p":"NTNU.IDATT1002.controllers","c":"SignUp","l":"signup_firstName"},{"p":"NTNU.IDATT1002.controllers","c":"SignUp","l":"signup_form"},{"p":"NTNU.IDATT1002.controllers","c":"SignUp","l":"signup_lastName"},{"p":"NTNU.IDATT1002.controllers","c":"SignUp","l":"signup_password"},{"p":"NTNU.IDATT1002.controllers","c":"SignUp","l":"signup_phoneCode"},{"p":"NTNU.IDATT1002.controllers","c":"SignUp","l":"signup_phoneNr"},{"p":"NTNU.IDATT1002.controllers","c":"SignUp","l":"signup_username"},{"p":"NTNU.IDATT1002.controllers","c":"SignUp","l":"SignUp()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.controllers","c":"SignUp","l":"signup(ActionEvent)","url":"signup(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"sorted_by_choicebox"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"sortedByChoicebox"},{"p":"NTNU.IDATT1002","c":"App","l":"start(Stage)","url":"start(javafx.stage.Stage)"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"switchToAlbums(ActionEvent)","url":"switchToAlbums(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"switchToAlbums(ActionEvent)","url":"switchToAlbums(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"switchToAlbums(ActionEvent)","url":"switchToAlbums(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Main","l":"switchToAlbums(ActionEvent)","url":"switchToAlbums(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"switchToAlbums(ActionEvent)","url":"switchToAlbums(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"switchToAlbums(ActionEvent)","url":"switchToAlbums(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"switchToAlbums(ActionEvent)","url":"switchToAlbums(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"switchToAlbums(ActionEvent)","url":"switchToAlbums(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"switchToAlbums(ActionEvent)","url":"switchToAlbums(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"switchToAlbums(ActionEvent)","url":"switchToAlbums(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"switchToAlbums(ActionEvent)","url":"switchToAlbums(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"switchToCreateAlbum(ActionEvent)","url":"switchToCreateAlbum(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"switchToExplore(ActionEvent)","url":"switchToExplore(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"switchToExplore(ActionEvent)","url":"switchToExplore(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"switchToExplore(ActionEvent)","url":"switchToExplore(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Main","l":"switchToExplore(ActionEvent)","url":"switchToExplore(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"switchToExplore(ActionEvent)","url":"switchToExplore(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"switchToExplore(ActionEvent)","url":"switchToExplore(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"switchToExplore(ActionEvent)","url":"switchToExplore(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"switchToExplore(ActionEvent)","url":"switchToExplore(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"switchToExplore(ActionEvent)","url":"switchToExplore(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"switchToExplore(ActionEvent)","url":"switchToExplore(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"switchToExplore(ActionEvent)","url":"switchToExplore(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"switchToMain(MouseEvent)","url":"switchToMain(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"switchToMain(MouseEvent)","url":"switchToMain(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"switchToMain(MouseEvent)","url":"switchToMain(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Main","l":"switchToMain(MouseEvent)","url":"switchToMain(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"switchToMain(MouseEvent)","url":"switchToMain(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"switchToMain(MouseEvent)","url":"switchToMain(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"switchToMain(MouseEvent)","url":"switchToMain(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"switchToMain(MouseEvent)","url":"switchToMain(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"switchToMain(MouseEvent)","url":"switchToMain(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"switchToMain(MouseEvent)","url":"switchToMain(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"switchToMain(MouseEvent)","url":"switchToMain(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"switchToMap(ActionEvent)","url":"switchToMap(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"switchToMap(ActionEvent)","url":"switchToMap(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"switchToMap(ActionEvent)","url":"switchToMap(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Main","l":"switchToMap(ActionEvent)","url":"switchToMap(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"switchToMap(ActionEvent)","url":"switchToMap(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"switchToMap(ActionEvent)","url":"switchToMap(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"switchToMap(ActionEvent)","url":"switchToMap(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"switchToMap(ActionEvent)","url":"switchToMap(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"switchToMap(ActionEvent)","url":"switchToMap(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"switchToMap(ActionEvent)","url":"switchToMap(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"switchToMap(ActionEvent)","url":"switchToMap(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"switchToNext(ActionEvent)","url":"switchToNext(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"switchToNext(ActionEvent)","url":"switchToNext(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"switchToNext(ActionEvent)","url":"switchToNext(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"switchToPicture(MouseEvent)","url":"switchToPicture(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"switchToPicture(MouseEvent)","url":"switchToPicture(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"switchToPrevious(ActionEvent)","url":"switchToPrevious(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"switchToPrevious(ActionEvent)","url":"switchToPrevious(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"switchToPrevious(ActionEvent)","url":"switchToPrevious(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"switchToSearch(ActionEvent)","url":"switchToSearch(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"switchToSearch(ActionEvent)","url":"switchToSearch(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"switchToSearch(ActionEvent)","url":"switchToSearch(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Main","l":"switchToSearch(ActionEvent)","url":"switchToSearch(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"switchToSearch(ActionEvent)","url":"switchToSearch(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"switchToSearch(ActionEvent)","url":"switchToSearch(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"switchToSearch(ActionEvent)","url":"switchToSearch(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"switchToSearch(ActionEvent)","url":"switchToSearch(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"switchToSearch(ActionEvent)","url":"switchToSearch(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"switchToSearch(ActionEvent)","url":"switchToSearch(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"switchToSearch(ActionEvent)","url":"switchToSearch(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Login","l":"switchToSignup(ActionEvent)","url":"switchToSignup(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"switchToUpload(ActionEvent)","url":"switchToUpload(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"switchToUpload(ActionEvent)","url":"switchToUpload(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"switchToUpload(ActionEvent)","url":"switchToUpload(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Main","l":"switchToUpload(ActionEvent)","url":"switchToUpload(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"switchToUpload(ActionEvent)","url":"switchToUpload(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"switchToUpload(ActionEvent)","url":"switchToUpload(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"switchToUpload(ActionEvent)","url":"switchToUpload(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"switchToUpload(ActionEvent)","url":"switchToUpload(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"switchToUpload(ActionEvent)","url":"switchToUpload(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"switchToUpload(ActionEvent)","url":"switchToUpload(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"switchToUpload(ActionEvent)","url":"switchToUpload(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"switchToViewAlbum(MouseEvent)","url":"switchToViewAlbum(javafx.scene.input.MouseEvent)"},{"p":"NTNU.IDATT1002.models","c":"Tag","l":"Tag()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.models","c":"Tag","l":"Tag(Long, String)","url":"%3Cinit%3E(java.lang.Long,java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"Tag","l":"Tag(String)","url":"%3Cinit%3E(java.lang.String)"},{"p":"NTNU.IDATT1002.models","c":"Tag","l":"Tag(Tag)","url":"%3Cinit%3E(NTNU.IDATT1002.models.Tag)"},{"p":"NTNU.IDATT1002.repository","c":"TagRepository","l":"TagRepository(EntityManager)","url":"%3Cinit%3E(javax.persistence.EntityManager)"},{"p":"NTNU.IDATT1002.service","c":"TagService","l":"TagService()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"tagStringSplit(TextField)","url":"tagStringSplit(javafx.scene.control.TextField)"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"tbar_albums"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"tbar_albums"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"tbar_albums"},{"p":"NTNU.IDATT1002.controllers","c":"Main","l":"tbar_albums"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"tbar_albums"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"tbar_albums"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"tbar_albums"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"tbar_albums"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"tbar_albums"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"tbar_albums"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"tbar_albums"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"tbar_explore"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"tbar_explore"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"tbar_explore"},{"p":"NTNU.IDATT1002.controllers","c":"Main","l":"tbar_explore"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"tbar_explore"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"tbar_explore"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"tbar_explore"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"tbar_explore"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"tbar_explore"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"tbar_explore"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"tbar_explore"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"tbar_logo"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"tbar_logo"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"tbar_logo"},{"p":"NTNU.IDATT1002.controllers","c":"Main","l":"tbar_logo"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"tbar_logo"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"tbar_logo"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"tbar_logo"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"tbar_logo"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"tbar_logo"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"tbar_logo"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"tbar_logo"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"tbar_map"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"tbar_map"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"tbar_map"},{"p":"NTNU.IDATT1002.controllers","c":"Main","l":"tbar_map"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"tbar_map"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"tbar_map"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"tbar_map"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"tbar_map"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"tbar_map"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"tbar_map"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"tbar_map"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"tbar_search"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"tbar_search"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"tbar_search"},{"p":"NTNU.IDATT1002.controllers","c":"Main","l":"tbar_search"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"tbar_search"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"tbar_search"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"tbar_search"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"tbar_search"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"tbar_search"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"tbar_search"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"tbar_search"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"tbar_searchBtn"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"tbar_searchBtn"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"tbar_searchBtn"},{"p":"NTNU.IDATT1002.controllers","c":"Main","l":"tbar_searchBtn"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"tbar_searchBtn"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"tbar_searchBtn"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"tbar_searchBtn"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"tbar_searchBtn"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"tbar_searchBtn"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"tbar_searchBtn"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"tbar_searchBtn"},{"p":"NTNU.IDATT1002.controllers","c":"CreateAlbum","l":"tbar_upload"},{"p":"NTNU.IDATT1002.controllers","c":"Explore","l":"tbar_upload"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"tbar_upload"},{"p":"NTNU.IDATT1002.controllers","c":"Main","l":"tbar_upload"},{"p":"NTNU.IDATT1002.controllers","c":"Map","l":"tbar_upload"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"tbar_upload"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"tbar_upload"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"tbar_upload"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"tbar_upload"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"tbar_upload"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"tbar_upload"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"Upload()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.controllers","c":"Main","l":"uploadBtn"},{"p":"NTNU.IDATT1002.controllers","c":"Upload","l":"uploadBtn"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"UploadedMultiple()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"UploadedSingle()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedMultiple","l":"uploadMultiple(ActionEvent)","url":"uploadMultiple(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.controllers","c":"UploadedSingle","l":"uploadSingle(ActionEvent)","url":"uploadSingle(javafx.event.ActionEvent)"},{"p":"NTNU.IDATT1002.models","c":"User","l":"User()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.models","c":"User","l":"User(String, String, String, String, String, String, Date)","url":"%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.util.Date)"},{"p":"NTNU.IDATT1002.controllers","c":"Login","l":"Username"},{"p":"NTNU.IDATT1002.repository","c":"UserRepository","l":"UserRepository(EntityManager)","url":"%3Cinit%3E(javax.persistence.EntityManager)"},{"p":"NTNU.IDATT1002.controllers","c":"SignUp","l":"userService"},{"p":"NTNU.IDATT1002.service","c":"UserService","l":"UserService(EntityManager)","url":"%3Cinit%3E(javax.persistence.EntityManager)"},{"p":"NTNU.IDATT1002.controllers","c":"ExploreAlbums","l":"vBox"},{"p":"NTNU.IDATT1002.controllers","c":"Search","l":"vBox"},{"p":"NTNU.IDATT1002.controllers","c":"ViewAlbum","l":"ViewAlbum()","url":"%3Cinit%3E()"},{"p":"NTNU.IDATT1002.controllers","c":"ViewPicture","l":"ViewPicture()","url":"%3Cinit%3E()"}]
\ No newline at end of file
diff --git a/javadoc/member-search-index.zip b/javadoc/member-search-index.zip
index 0f1d76dcb5ae68551c064d32fecd556236257f2a..959fdeb2d780068385b057341b552914739ec914 100644
Binary files a/javadoc/member-search-index.zip and b/javadoc/member-search-index.zip differ
diff --git a/javadoc/overview-summary.html b/javadoc/overview-summary.html
index 847634be6df0d29dd816f6c4e695c21da0a4fcf2..506d806e0d5af6956463ec0deab78c8ebb62da21 100644
--- a/javadoc/overview-summary.html
+++ b/javadoc/overview-summary.html
@@ -2,7 +2,7 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>Generated Documentation (Untitled)</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script type="text/javascript">window.location.replace('index.html')</script>
diff --git a/javadoc/overview-tree.html b/javadoc/overview-tree.html
index 729c016db07fd460600324a48ef99d871d0119ff..3274bdae29c76c4c7d0f86debeab6768a66629ce 100644
--- a/javadoc/overview-tree.html
+++ b/javadoc/overview-tree.html
@@ -2,10 +2,10 @@
<!-- NewPage -->
<html lang="no">
<head>
-<!-- Generated by javadoc (11.0.4) on Thu Mar 19 15:52:33 CET 2020 -->
+<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>Class Hierarchy</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="dc.created" content="2020-03-19">
+<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
@@ -99,8 +99,11 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<ul class="horizontal">
<li><a href="NTNU/IDATT1002/package-tree.html">NTNU.IDATT1002</a>, </li>
<li><a href="NTNU/IDATT1002/controllers/package-tree.html">NTNU.IDATT1002.controllers</a>, </li>
+<li><a href="NTNU/IDATT1002/database/package-tree.html">NTNU.IDATT1002.database</a>, </li>
+<li><a href="NTNU/IDATT1002/filters/package-tree.html">NTNU.IDATT1002.filters</a>, </li>
<li><a href="NTNU/IDATT1002/models/package-tree.html">NTNU.IDATT1002.models</a>, </li>
<li><a href="NTNU/IDATT1002/repository/package-tree.html">NTNU.IDATT1002.repository</a>, </li>
+<li><a href="NTNU/IDATT1002/service/package-tree.html">NTNU.IDATT1002.service</a>, </li>
<li><a href="NTNU/IDATT1002/utils/package-tree.html">NTNU.IDATT1002.utils</a></li>
</ul>
</div>
@@ -110,23 +113,54 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<ul>
<li class="circle">java.lang.Object
<ul>
+<li class="circle">NTNU.IDATT1002.models.<a href="NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Album</span></a></li>
+<li class="circle">NTNU.IDATT1002.filters.<a href="NTNU/IDATT1002/filters/AlbumFilter.html" title="class in NTNU.IDATT1002.filters"><span class="typeNameLink">AlbumFilter</span></a></li>
+<li class="circle">NTNU.IDATT1002.repository.<a href="NTNU/IDATT1002/repository/AlbumRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">AlbumRepository</span></a></li>
+<li class="circle">NTNU.IDATT1002.service.<a href="NTNU/IDATT1002/service/AlbumService.html" title="class in NTNU.IDATT1002.service"><span class="typeNameLink">AlbumService</span></a></li>
<li class="circle">javafx.application.Application
<ul>
<li class="circle">NTNU.IDATT1002.<a href="NTNU/IDATT1002/App.html" title="class in NTNU.IDATT1002"><span class="typeNameLink">App</span></a></li>
</ul>
</li>
+<li class="circle">NTNU.IDATT1002.<a href="NTNU/IDATT1002/ApplicationState.html" title="class in NTNU.IDATT1002"><span class="typeNameLink">ApplicationState</span></a></li>
<li class="circle">NTNU.IDATT1002.utils.<a href="NTNU/IDATT1002/utils/Authentication.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">Authentication</span></a></li>
-<li class="circle">NTNU.IDATT1002.utils.<a href="NTNU/IDATT1002/utils/CreateUser.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">CreateUser</span></a></li>
-<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/ExploreController.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">ExploreController</span></a></li>
-<li class="circle">NTNU.IDATT1002.utils.<a href="NTNU/IDATT1002/utils/ExtractMetaData.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">ExtractMetaData</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">CreateAlbum</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">DataExchange</span></a></li>
+<li class="circle">NTNU.IDATT1002.database.<a href="NTNU/IDATT1002/database/EntityManagerConfig.html" title="class in NTNU.IDATT1002.database"><span class="typeNameLink">EntityManagerConfig</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Explore</span></a> (implements javafx.fxml.Initializable)</li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">ExploreAlbums</span></a> (implements javafx.fxml.Initializable)</li>
+<li class="circle">NTNU.IDATT1002.models.<a href="NTNU/IDATT1002/models/GeoLocation.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">GeoLocation</span></a></li>
+<li class="circle">NTNU.IDATT1002.repository.<a href="NTNU/IDATT1002/repository/GeoLocatioRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">GeoLocatioRepository</span></a></li>
+<li class="circle">NTNU.IDATT1002.models.<a href="NTNU/IDATT1002/models/Histogram.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Histogram</span></a></li>
+<li class="circle">NTNU.IDATT1002.repository.<a href="NTNU/IDATT1002/repository/HistorgramRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">HistorgramRepository</span></a></li>
<li class="circle">NTNU.IDATT1002.models.<a href="NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Image</span></a></li>
-<li class="circle">NTNU.IDATT1002.models.<a href="NTNU/IDATT1002/models/ImageAlbum.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">ImageAlbum</span></a></li>
-<li class="circle">NTNU.IDATT1002.repository.<a href="NTNU/IDATT1002/repository/ImageAlbumRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">ImageAlbumRepository</span></a> (implements NTNU.IDATT1002.repository.<a href="NTNU/IDATT1002/repository/Repository.html" title="interface in NTNU.IDATT1002.repository">Repository</a><T,​ID>)</li>
-<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/LoggedInController.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">LoggedInController</span></a></li>
-<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/LoginController.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">LoginController</span></a></li>
-<li class="circle">NTNU.IDATT1002.utils.<a href="NTNU/IDATT1002/utils/MultiplePhotos.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">MultiplePhotos</span></a></li>
-<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/SignUpController.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">SignUpController</span></a></li>
+<li class="circle">NTNU.IDATT1002.filters.<a href="NTNU/IDATT1002/filters/ImageFilter.html" title="class in NTNU.IDATT1002.filters"><span class="typeNameLink">ImageFilter</span></a></li>
+<li class="circle">NTNU.IDATT1002.repository.<a href="NTNU/IDATT1002/repository/ImageRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">ImageRepository</span></a></li>
+<li class="circle">NTNU.IDATT1002.service.<a href="NTNU/IDATT1002/service/ImageService.html" title="class in NTNU.IDATT1002.service"><span class="typeNameLink">ImageService</span></a></li>
+<li class="circle">NTNU.IDATT1002.utils.<a href="NTNU/IDATT1002/utils/ImageUtil.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">ImageUtil</span></a></li>
+<li class="circle">NTNU.IDATT1002.database.<a href="NTNU/IDATT1002/database/LoadDatabase.html" title="class in NTNU.IDATT1002.database"><span class="typeNameLink">LoadDatabase</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/Login.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Login</span></a></li>
+<li class="circle">NTNU.IDATT1002.models.<a href="NTNU/IDATT1002/models/Login.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Login</span></a></li>
+<li class="circle">NTNU.IDATT1002.repository.<a href="NTNU/IDATT1002/repository/LoginRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">LoginRepository</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Main</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Map</span></a></li>
+<li class="circle">NTNU.IDATT1002.models.<a href="NTNU/IDATT1002/models/Metadata.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Metadata</span></a></li>
+<li class="circle">NTNU.IDATT1002.utils.<a href="NTNU/IDATT1002/utils/MetaDataExtractor.html" title="class in NTNU.IDATT1002.utils"><span class="typeNameLink">MetaDataExtractor</span></a></li>
+<li class="circle">NTNU.IDATT1002.repository.<a href="NTNU/IDATT1002/repository/MetadataRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">MetadataRepository</span></a></li>
+<li class="circle">NTNU.IDATT1002.service.<a href="NTNU/IDATT1002/service/PdfDocument.html" title="class in NTNU.IDATT1002.service"><span class="typeNameLink">PdfDocument</span></a> (implements NTNU.IDATT1002.service.<a href="NTNU/IDATT1002/service/AlbumDocument.html" title="interface in NTNU.IDATT1002.service">AlbumDocument</a>)</li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Search</span></a> (implements javafx.fxml.Initializable)</li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">SignUp</span></a></li>
+<li class="circle">NTNU.IDATT1002.models.<a href="NTNU/IDATT1002/models/Tag.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">Tag</span></a></li>
+<li class="circle">NTNU.IDATT1002.repository.<a href="NTNU/IDATT1002/repository/TagRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">TagRepository</span></a></li>
+<li class="circle">NTNU.IDATT1002.service.<a href="NTNU/IDATT1002/service/TagService.html" title="class in NTNU.IDATT1002.service"><span class="typeNameLink">TagService</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">Upload</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">UploadedMultiple</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">UploadedSingle</span></a> (implements javafx.fxml.Initializable)</li>
<li class="circle">NTNU.IDATT1002.models.<a href="NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models"><span class="typeNameLink">User</span></a></li>
+<li class="circle">NTNU.IDATT1002.repository.<a href="NTNU/IDATT1002/repository/UserRepository.html" title="class in NTNU.IDATT1002.repository"><span class="typeNameLink">UserRepository</span></a></li>
+<li class="circle">NTNU.IDATT1002.service.<a href="NTNU/IDATT1002/service/UserService.html" title="class in NTNU.IDATT1002.service"><span class="typeNameLink">UserService</span></a></li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">ViewAlbum</span></a> (implements javafx.fxml.Initializable)</li>
+<li class="circle">NTNU.IDATT1002.controllers.<a href="NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers"><span class="typeNameLink">ViewPicture</span></a> (implements javafx.fxml.Initializable)</li>
</ul>
</li>
</ul>
@@ -134,6 +168,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
<section role="region">
<h2 title="Interface Hierarchy">Interface Hierarchy</h2>
<ul>
+<li class="circle">NTNU.IDATT1002.service.<a href="NTNU/IDATT1002/service/AlbumDocument.html" title="interface in NTNU.IDATT1002.service"><span class="typeNameLink">AlbumDocument</span></a></li>
<li class="circle">NTNU.IDATT1002.repository.<a href="NTNU/IDATT1002/repository/Repository.html" title="interface in NTNU.IDATT1002.repository"><span class="typeNameLink">Repository</span></a><T,​ID></li>
</ul>
</section>
diff --git a/javadoc/package-search-index.js b/javadoc/package-search-index.js
index 7aa07e5525c08b7e3d574dd9cffee65b2c6a42c2..7225a22895174132985a1fc465904ad2535fa8dd 100644
--- a/javadoc/package-search-index.js
+++ b/javadoc/package-search-index.js
@@ -1 +1 @@
-packageSearchIndex = [{"l":"All Packages","url":"allpackages-index.html"},{"l":"NTNU.IDATT1002"},{"l":"NTNU.IDATT1002.controllers"},{"l":"NTNU.IDATT1002.models"},{"l":"NTNU.IDATT1002.repository"},{"l":"NTNU.IDATT1002.utils"}]
\ No newline at end of file
+packageSearchIndex = [{"l":"All Packages","url":"allpackages-index.html"},{"l":"NTNU.IDATT1002"},{"l":"NTNU.IDATT1002.controllers"},{"l":"NTNU.IDATT1002.database"},{"l":"NTNU.IDATT1002.filters"},{"l":"NTNU.IDATT1002.models"},{"l":"NTNU.IDATT1002.repository"},{"l":"NTNU.IDATT1002.service"},{"l":"NTNU.IDATT1002.utils"}]
\ No newline at end of file
diff --git a/javadoc/package-search-index.zip b/javadoc/package-search-index.zip
index f54d315040d40ad30850a46fc04141725432bd3b..b9c80da2ee330742b526553f1ad870d2f17394c2 100644
Binary files a/javadoc/package-search-index.zip and b/javadoc/package-search-index.zip differ
diff --git a/javadoc/type-search-index.js b/javadoc/type-search-index.js
index 872637ab1f119248d2b03a9827791b3428b3cc46..36165c0b0a0ae19c74dc41c047a34e2df22a81ce 100644
--- a/javadoc/type-search-index.js
+++ b/javadoc/type-search-index.js
@@ -1 +1 @@
-typeSearchIndex = [{"l":"All Classes","url":"allclasses-index.html"},{"p":"NTNU.IDATT1002","l":"App"},{"p":"NTNU.IDATT1002.utils","l":"Authentication"},{"p":"NTNU.IDATT1002.utils","l":"CreateUser"},{"p":"NTNU.IDATT1002.controllers","l":"ExploreController"},{"p":"NTNU.IDATT1002.utils","l":"ExtractMetaData"},{"p":"NTNU.IDATT1002.models","l":"Image"},{"p":"NTNU.IDATT1002.models","l":"ImageAlbum"},{"p":"NTNU.IDATT1002.repository","l":"ImageAlbumRepository"},{"p":"NTNU.IDATT1002.controllers","l":"LoggedInController"},{"p":"NTNU.IDATT1002.controllers","l":"LoginController"},{"p":"NTNU.IDATT1002.utils","l":"MultiplePhotos"},{"p":"NTNU.IDATT1002.repository","l":"Repository"},{"p":"NTNU.IDATT1002.controllers","l":"SignUpController"},{"p":"NTNU.IDATT1002.models","l":"User"}]
\ No newline at end of file
+typeSearchIndex = [{"p":"NTNU.IDATT1002.models","l":"Album"},{"p":"NTNU.IDATT1002.service","l":"AlbumDocument"},{"p":"NTNU.IDATT1002.filters","l":"AlbumFilter"},{"p":"NTNU.IDATT1002.repository","l":"AlbumRepository"},{"p":"NTNU.IDATT1002.service","l":"AlbumService"},{"l":"All Classes","url":"allclasses-index.html"},{"p":"NTNU.IDATT1002","l":"App"},{"p":"NTNU.IDATT1002","l":"ApplicationState"},{"p":"NTNU.IDATT1002.utils","l":"Authentication"},{"p":"NTNU.IDATT1002.controllers","l":"CreateAlbum"},{"p":"NTNU.IDATT1002.controllers","l":"DataExchange"},{"p":"NTNU.IDATT1002.database","l":"EntityManagerConfig"},{"p":"NTNU.IDATT1002.controllers","l":"Explore"},{"p":"NTNU.IDATT1002.controllers","l":"ExploreAlbums"},{"p":"NTNU.IDATT1002.models","l":"GeoLocation"},{"p":"NTNU.IDATT1002.repository","l":"GeoLocatioRepository"},{"p":"NTNU.IDATT1002.models","l":"Histogram"},{"p":"NTNU.IDATT1002.repository","l":"HistorgramRepository"},{"p":"NTNU.IDATT1002.models","l":"Image"},{"p":"NTNU.IDATT1002.filters","l":"ImageFilter"},{"p":"NTNU.IDATT1002.repository","l":"ImageRepository"},{"p":"NTNU.IDATT1002.service","l":"ImageService"},{"p":"NTNU.IDATT1002.utils","l":"ImageUtil"},{"p":"NTNU.IDATT1002.database","l":"LoadDatabase"},{"p":"NTNU.IDATT1002.controllers","l":"Login"},{"p":"NTNU.IDATT1002.models","l":"Login"},{"p":"NTNU.IDATT1002.repository","l":"LoginRepository"},{"p":"NTNU.IDATT1002.controllers","l":"Main"},{"p":"NTNU.IDATT1002.controllers","l":"Map"},{"p":"NTNU.IDATT1002.models","l":"Metadata"},{"p":"NTNU.IDATT1002.utils","l":"MetaDataExtractor"},{"p":"NTNU.IDATT1002.repository","l":"MetadataRepository"},{"p":"NTNU.IDATT1002.service","l":"PdfDocument"},{"p":"NTNU.IDATT1002.repository","l":"Repository"},{"p":"NTNU.IDATT1002.controllers","l":"Search"},{"p":"NTNU.IDATT1002.controllers","l":"SignUp"},{"p":"NTNU.IDATT1002.models","l":"Tag"},{"p":"NTNU.IDATT1002.repository","l":"TagRepository"},{"p":"NTNU.IDATT1002.service","l":"TagService"},{"p":"NTNU.IDATT1002.controllers","l":"Upload"},{"p":"NTNU.IDATT1002.controllers","l":"UploadedMultiple"},{"p":"NTNU.IDATT1002.controllers","l":"UploadedSingle"},{"p":"NTNU.IDATT1002.models","l":"User"},{"p":"NTNU.IDATT1002.repository","l":"UserRepository"},{"p":"NTNU.IDATT1002.service","l":"UserService"},{"p":"NTNU.IDATT1002.controllers","l":"ViewAlbum"},{"p":"NTNU.IDATT1002.controllers","l":"ViewPicture"}]
\ No newline at end of file
diff --git a/javadoc/type-search-index.zip b/javadoc/type-search-index.zip
index 27106b357ea9606ff9069b2a902232f8ab39c3f2..ffccfb07093bbb17b2e0b48f6a5b6efb66c3d035 100644
Binary files a/javadoc/type-search-index.zip and b/javadoc/type-search-index.zip differ
diff --git a/pom.xml b/pom.xml
index be578d4abe66e32f5944d8c5d6340eb854d5008b..da7e76c383b8702b09542b8b9a90475a42b2acc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,13 +38,11 @@
<artifactId>hibernate-jpa-2.1-api</artifactId>
<version>1.0.2.Final</version>
</dependency>
-
- <dependency>
+ <dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>6.1.0.Final</version>
</dependency>
-
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
@@ -71,6 +69,19 @@
<version>13</version>
</dependency>
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-web</artifactId>
+ <version>15-ea+2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.webkit</groupId>
+ <artifactId>webview-deps</artifactId>
+ <version>1.3.2</version>
+ <type>pom</type>
+ </dependency>
+
<!-- MySQL Driver -->
<dependency>
<groupId>mysql</groupId>
@@ -97,7 +108,6 @@
<artifactId>junit</artifactId>
<version>4.13</version>
</dependency>
-
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
@@ -105,6 +115,19 @@
<version>1.4.194</version>
</dependency>
+ <!-- Pdf -->
+ <dependency>
+ <groupId>com.itextpdf</groupId>
+ <artifactId>itextpdf</artifactId>
+ <version>5.5.10</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>1.56</version>
+ </dependency>
+
</dependencies>
<build>
<plugins>
diff --git a/src/main/java/NTNU/IDATT1002/App.java b/src/main/java/NTNU/IDATT1002/App.java
index 5d464e8d1291ac44f7ab9b6146a797018eb2c62c..fb11cd8b0cecf4eba770e6b36b59facc550e194b 100644
--- a/src/main/java/NTNU/IDATT1002/App.java
+++ b/src/main/java/NTNU/IDATT1002/App.java
@@ -1,5 +1,7 @@
package NTNU.IDATT1002;
+import NTNU.IDATT1002.controllers.DataExchange;
+import NTNU.IDATT1002.database.EntityManagerConfig;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
@@ -11,11 +13,17 @@ import java.io.IOException;
public class App extends Application {
+ public static DataExchange ex;
private static Scene scene;
@Override
public void start(Stage stage) throws IOException {
+ ex = new DataExchange();
+ ex.setHostServices(getHostServices());
+ ex.setEntityManager(EntityManagerConfig.getEntityManager());
+
scene = new Scene(loadFXML("login"));
+ stage.setMaximized(true);
stage.setScene(scene);
stage.show();
}
diff --git a/src/main/java/NTNU/IDATT1002/ApplicationState.java b/src/main/java/NTNU/IDATT1002/ApplicationState.java
new file mode 100644
index 0000000000000000000000000000000000000000..cc727dcaa48d7e397c8ece1723e2e3f5fff2be11
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/ApplicationState.java
@@ -0,0 +1,51 @@
+package NTNU.IDATT1002;
+
+
+import NTNU.IDATT1002.database.EntityManagerConfig;
+import NTNU.IDATT1002.models.User;
+import NTNU.IDATT1002.repository.UserRepository;
+
+import javax.persistence.EntityManager;
+
+/**
+ * Class Application State. Keeps a record of the global application state, such as the current logged in user.
+ */
+public final class ApplicationState {
+
+ /**
+ * The current logged in user.
+ */
+ private static User currentUser;
+
+ /**
+ * Anonymous user for developing purposes.
+ */
+ private static String anonymousUserUsername = "Anonymous";
+
+ private static UserRepository userRepository;
+
+ /**
+ * Initiate properties and save an anonymous user once.
+ */
+ static {
+ EntityManager entityManager = EntityManagerConfig.getEntityManager();
+
+ userRepository = new UserRepository(entityManager);
+ }
+
+ public static void setCurrentUser(User currentUser) {
+ ApplicationState.currentUser = currentUser;
+ }
+
+ /**
+ * Retrieve the current logged in user if present, or retrieve an anonymous user.
+ *
+ * @return the current user.
+ * @throws IllegalArgumentException if neither the current user nor the anonymous user are present.
+ */
+ public static User getCurrentUser() {
+ return userRepository.findById(currentUser.getUsername())
+ .orElseGet(() -> userRepository.findById(anonymousUserUsername)
+ .orElseThrow(IllegalArgumentException::new));
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/CreateAlbum.java b/src/main/java/NTNU/IDATT1002/controllers/CreateAlbum.java
new file mode 100644
index 0000000000000000000000000000000000000000..97023b782503245d4eec9e375cf9a31271f6dc38
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/CreateAlbum.java
@@ -0,0 +1,118 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import NTNU.IDATT1002.ApplicationState;
+import NTNU.IDATT1002.models.User;
+import NTNU.IDATT1002.service.AlbumService;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Pane;
+
+import javax.persistence.EntityManager;
+import java.io.IOException;
+
+/**
+ * Controls the buttons and changeable elements on create_album.fxml,
+ * a page where you create albums
+ * @version 1.0 22.03.2020
+ */
+public class CreateAlbum {
+ public TextField tbar_search;
+ public ImageView tbar_logo;
+ public Button tbar_explore;
+ public Button tbar_map;
+ public Button tbar_upload;
+ public TextField album_title_field;
+ public TextField album_tag_field;
+ public TextArea album_desc_field;
+ public Pane metadata_pane;
+ public GridPane image_grid;
+ public Button add_images_button;
+ public Button create_album_button;
+ public Button tbar_albums;
+ public Button tbar_searchBtn;
+
+ private AlbumService albumService;
+
+ public CreateAlbum() {
+ EntityManager entityManager = App.ex.getEntityManager();
+ albumService = new AlbumService(entityManager);
+ }
+
+ /**
+ * Method that changes stage to Main page
+ * @param mouseEvent
+ * @throws IOException
+ */
+ public void switchToMain(MouseEvent mouseEvent) throws IOException {
+ App.setRoot("main");
+ }
+
+ /**
+ * Method that changes stage to Search page. It reads the value of the search
+ * field and if not empty it is passed to dataexchange
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToSearch(ActionEvent actionEvent) throws IOException {
+ if (!tbar_search.getText().isEmpty()){
+ App.ex.setSearchField(tbar_search.getText());
+ }
+ App.setRoot("search");
+ }
+
+ /**
+ * Method that changes stage to Explore page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToExplore(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore");
+ }
+
+ /**
+ * Method that changes stage to Albums page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
+
+ /**
+ * Method that changes stage to Map page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToMap(ActionEvent actionEvent) throws IOException {
+ App.setRoot("map");
+ }
+
+ /**
+ * Method that changes stage to Upload page
+ * @param actionEvent the mouse has done something
+ * @throws IOException this page does not exist
+ */
+ public void switchToUpload(ActionEvent actionEvent) throws IOException {
+ App.setRoot("upload");
+ }
+
+ /**
+ * Create an empty album. The user will default to the currently logged in user.
+ *
+ * @param actionEvent
+ */
+ public void createEmptyAlbum(ActionEvent actionEvent) {
+ String title = album_title_field.getText();
+ String description = album_desc_field.getText();
+ String tags = album_tag_field.getText();
+ User user = ApplicationState.getCurrentUser();
+
+ albumService.createAlbum(title, description, user, tags);
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/DataExchange.java b/src/main/java/NTNU/IDATT1002/controllers/DataExchange.java
new file mode 100644
index 0000000000000000000000000000000000000000..3a44807b958285650c2141748d414c7fc76769d2
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/DataExchange.java
@@ -0,0 +1,76 @@
+package NTNU.IDATT1002.controllers;
+
+import javafx.application.HostServices;
+
+import javax.persistence.EntityManager;
+import java.io.File;
+import java.util.List;
+
+/**
+ * Class for storing temporary variables between controllers,
+ * when the scene changes
+ * @version 1.0 22.03.2020
+ */
+public class DataExchange {
+
+ private EntityManager entityManager;
+ public HostServices hostServices;
+ private String searchField;
+ private List<File> uploadedFiles;
+ private Long chosenAlbumId;
+ private String chosenImg;
+
+ public DataExchange(){
+ searchField = "";
+ }
+
+ public EntityManager getEntityManager() {
+ return entityManager;
+ }
+
+ public HostServices getHostServices() {
+ return hostServices;
+ }
+
+ public List<File> getUploadedFiles() {
+ return uploadedFiles;
+ }
+
+ public String getSearchField() {
+ return searchField;
+ }
+
+ public Long getChosenAlbumId() {
+ return chosenAlbumId;
+ }
+
+ public String getChosenImg() {
+ return chosenImg;
+ }
+
+ public void setEntityManager(EntityManager entityManager) {
+ this.entityManager = entityManager;
+ }
+
+ public void setHostServices(HostServices hostServices) {
+ this.hostServices = hostServices;
+ }
+
+ public void setUploadedFiles(List<File> uploadedFiles) {
+ this.uploadedFiles = uploadedFiles;
+ }
+
+ public void setSearchField(String searchField) {
+ this.searchField = searchField;
+ }
+
+ public void setChosenAlbumId(Long chosenAlbumId) {
+ this.chosenAlbumId = chosenAlbumId;
+ }
+
+ public void setChosenImg(String chosenImg) {
+ this.chosenImg = chosenImg;
+ }
+
+}
+
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Explore.java b/src/main/java/NTNU/IDATT1002/controllers/Explore.java
new file mode 100644
index 0000000000000000000000000000000000000000..be2e8c09c24fde9a5765d977826941270f1edba5
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/Explore.java
@@ -0,0 +1,187 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.fxml.Initializable;
+import javafx.geometry.Pos;
+import javafx.scene.control.Button;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ResourceBundle;
+
+/**
+ * Controls the buttons and changeable elements on explore.fxml,
+ * a page where you explore images
+ * @version 1.0 22.03.2020
+ */
+public class Explore implements Initializable {
+
+ public ImageView tbar_logo;
+ public TextField tbar_search;
+ public Button tbar_searchBtn;
+ public Button tbar_explore;
+ public Button tbar_map;
+ public Button tbar_upload;
+ public Button tbar_albums;
+ public ScrollPane scrollPane;
+ public GridPane gridPane;
+ public Button footer_previousBtn;
+ public Button footer_nextBtn;
+
+
+ /**
+ * Method that runs when explore.fxml is set as scene
+ * Generates content based on a list of images
+ * @param url
+ * @param resourceBundle
+ */
+ @Override
+ public void initialize(URL url, ResourceBundle resourceBundle) {
+ List<String> urls = Arrays.asList("@../../Images/placeholder-1920x1080.png", "@../../Images/party.jpg", "@../../Images/placeholderLogo.png", "@../../Images/party.jpg","@../../Images/placeholder-1920x1080.png", "@../../Images/placeholderLogo.png", "@../../Images/placeholder-1920x1080.png", "@../../Images/placeholderLogo.png", "@../../Images/party.jpg", "@../../Images/placeholderLogo.png", "@../../Images/party.jpg","@../../Images/placeholder-1920x1080.png", "@../../Images/placeholderLogo.png", "@../../Images/placeholder-1920x1080.png", "@../../Images/party.jpg");
+ //Limited elements to 15 since grid pane since is 3x15
+ //Can implement automatic row adding when this limit exceeded later
+ for(int i = 0; i < urls.size() && i < 15; i++) {
+ //Row and column in gripdane
+ int column = i%3;
+ int row = (i-column)/3;
+
+ //Make vbox container for content
+ VBox v = new VBox();
+ v.setPrefHeight(400);
+ v.setPrefWidth(400);
+ v.setAlignment(Pos.CENTER);
+ v.setStyle("-fx-background-color: #999999;");
+
+ //Image container
+ ImageView iV = new ImageView();
+ iV.setImage(new Image(urls.get(i)));
+ iV.setFitHeight(250);
+ iV.setFitWidth(400);
+ iV.pickOnBoundsProperty().setValue(true);
+ iV.setPreserveRatio(true);
+ //Link to view image page
+ iV.setOnMouseClicked(new EventHandler<MouseEvent>() {
+ @Override public void handle(MouseEvent e) {
+ try{
+ switchToPicture(e);
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+ }
+ });
+
+ //Text describing the picture's title and tag
+ Text title = new Text("TITLE:");
+ title.setFont(Font.font("System Bold", 24));
+ Text tag = new Text("#TAGS");
+ tag.setFont(Font.font("System Bold", 18));
+
+ //Add elements to vbox
+ v.getChildren().addAll(iV, title, tag);
+
+ //Add vbox to gridpane
+ gridPane.add(v, column, row);
+ }
+ }
+
+ /**
+ * Method that changes scene to Main page
+ * @param mouseEvent
+ * @throws IOException
+ */
+ public void switchToMain(MouseEvent mouseEvent) throws IOException {
+ App.setRoot("main");
+ }
+
+ /**
+ * Method that changes scene to Search page. It reads the value of the search
+ * field and if not empty it is passed to dataexchange
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToSearch(ActionEvent actionEvent) throws IOException {
+ if (!tbar_search.getText().isEmpty()){
+ App.ex.setSearchField(tbar_search.getText());
+ }
+ App.setRoot("search");
+ }
+
+ /**
+ * Method that changes scene to Explore page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToExplore(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore");
+ }
+
+ /**
+ * Method that changes scene to Albums page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
+
+ /**
+ * Method that changes scene to Map page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToMap(ActionEvent actionEvent) throws IOException {
+ App.setRoot("map");
+ }
+
+ /**
+ * Method that changes scene to Upload page
+ * @param actionEvent the mouse has done something
+ * @throws IOException this page does not exist
+ */
+ public void switchToUpload(ActionEvent actionEvent) throws IOException {
+ App.setRoot("upload");
+ }
+
+ /**
+ * Method that changes scene to View Picture page for the image that was clicked
+ * @param mouseEvent
+ * @throws IOException
+ */
+ public void switchToPicture(MouseEvent mouseEvent) throws IOException {
+ if(mouseEvent.getSource() instanceof ImageView){
+ App.ex.setChosenImg(((ImageView) mouseEvent.getSource()).getImage().getUrl());
+ App.setRoot("view_picture");
+ }
+ }
+
+ /**
+ * Method that updates content to previous "page"
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToPrevious(ActionEvent actionEvent) throws IOException {
+ //TODO: Make method that updates content to previous "page"
+ }
+
+ /**
+ * Method that updates content to next "page"
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToNext(ActionEvent actionEvent) throws IOException {
+ //TODO: Make method that updates content to next "page"
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java b/src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
new file mode 100644
index 0000000000000000000000000000000000000000..c6833e939e520d6baea5e676ff69544316d8a367
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
@@ -0,0 +1,347 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import NTNU.IDATT1002.models.Album;
+import NTNU.IDATT1002.models.Tag;
+import NTNU.IDATT1002.service.AlbumService;
+import NTNU.IDATT1002.utils.ImageUtil;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.fxml.Initializable;
+import javafx.geometry.Insets;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontWeight;
+import javafx.scene.text.Text;
+
+import javax.persistence.EntityManager;
+import java.io.IOException;
+import java.net.URL;
+import java.util.List;
+import java.util.ResourceBundle;
+import java.util.stream.Collectors;
+
+/**
+ * Controls the buttons and changeable elements on explore_albums.fxml,
+ * a page where you explore albums
+ * @version 1.0 22.03.2020
+ */
+public class ExploreAlbums implements Initializable {
+ public ImageView tbar_logo;
+ public TextField tbar_search;
+ public Button tbar_map;
+ public Button tbar_upload;
+ public Button tbar_albums;
+ public Button tbar_searchBtn;
+ public Button tbar_explore;
+
+ public ScrollPane scrollpane;
+ //public Button footer_previous_page;
+ //public Button footer_next_page;
+
+ public Text albumAmount;
+ public ChoiceBox sortedByChoicebox;
+ public Button createAlbumButton;
+
+
+ public ImageView albumImage;
+ public VBox vBox;
+
+ private AlbumService albumService;
+
+ public ExploreAlbums() {
+ EntityManager entityManager = App.ex.getEntityManager();
+ albumService = new AlbumService(entityManager);
+ }
+
+ /**
+ * Initialize page with all albums. Max 50 per page.
+ *
+ * @param url
+ * @param resourceBundle
+ */
+ @Override
+ public void initialize(URL url, ResourceBundle resourceBundle) {
+ try {
+ List<Album> albums = albumService.getAllAlbums();
+ int maxPerPage = Math.min(albums.size(), 50);
+
+ for (int i = 0; i < maxPerPage; i++) {
+ //A container for image and album text
+ HBox albumContainer = new HBox();
+ //Stores album id here so that it can be passed to data exchange,
+ //and the correct album will appear on View Album page when clicked
+ albumContainer.setId(albums.get(i).getId().toString());
+ albumContainer.setPrefWidth(1520);
+ albumContainer.setPrefHeight(300);
+
+ insertAlbumImageToContainer(albums.get(i), albumContainer);
+ insertAlbumTextToContainer(albums.get(i), albumContainer);
+
+ vBox.getChildren().add(albumContainer);
+ }
+ }
+ catch (Exception e){
+ //TODO: if no albums exist... msg?
+ }
+ }
+
+ /**
+ * Format and insert the first image in the given album to the given container.
+ *
+ * @param album the album from the database
+ * @param albumContainer the container for each separate album
+ */
+ private void insertAlbumImageToContainer(Album album, HBox albumContainer) {
+ albumImage = new ImageView();
+ albumImage.setFitHeight(300.0);
+ albumImage.setFitWidth(533.0);
+ albumImage.setPickOnBounds(true);
+ albumImage.setPreserveRatio(true);
+ albumImage.setOnMouseClicked(new EventHandler<MouseEvent>() {
+ @Override public void handle(MouseEvent mouseEvent) {
+ try{
+ switchToViewAlbum(mouseEvent);
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+ }
+ });
+
+ NTNU.IDATT1002.models.Image titleImage = album.getImages().get(0);
+ Image image = ImageUtil.convertToFXImage(titleImage);
+ albumImage.setImage(image);
+
+ albumContainer.getChildren().add(albumImage);
+ }
+
+ /**
+ * Att text elements from album to the container
+ *
+ * @param album the album to display
+ * @param albumContainer the container for each separate album
+ */
+ private void insertAlbumTextToContainer(Album album, HBox albumContainer) {
+ //Creates a vbox so that nodes is aligned in a column
+ VBox textContainer = new VBox();
+ textContainer.setSpacing(5);
+ textContainer.setPadding(new Insets(10, 0, 0, 25));
+ textContainer.setPrefHeight(300);
+ textContainer.setPrefWidth(987);
+
+ insertAlbumTitle(album, textContainer);
+ insertAlbumAuthor(album, textContainer);
+ insertAlbumTags(album, textContainer);
+ insertAlbumDescription(album, textContainer);
+
+ albumContainer.getChildren().add(textContainer);
+ }
+
+ /**
+ * Insert title of the given album to the given container
+ * It is clickable, and switches to View Album page of that album
+ *
+ * @param album the album which title to display
+ * @param textContainer container for text elements of an album
+ */
+ private void insertAlbumTitle(Album album, VBox textContainer) {
+ HBox content = new HBox();
+
+ Text titleLabel = new Text("Title: ");
+ titleLabel.setFont(Font.font("System", FontWeight.BOLD, 48));
+
+ Text title = new Text(album.getTitle());
+ title.setFont(Font.font("System",48));
+
+ content.getChildren().addAll(titleLabel, title);
+ content.setOnMouseClicked(new EventHandler<MouseEvent>() {
+ @Override public void handle(MouseEvent mouseEvent) {
+ try{
+ switchToViewAlbum(mouseEvent);
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+ }
+ });
+
+ textContainer.getChildren().add(content);
+ }
+
+ /**
+ * Insert author of the given album to the given container
+ *
+ * @param album the album which author to display
+ * @param textContainer container for text elements of an album
+ */
+ private void insertAlbumAuthor(Album album, VBox textContainer) {
+ HBox content = new HBox();
+ Text authorLabel = new Text("Author: ");
+ authorLabel.setFont(Font.font("System", FontWeight.BOLD, 24));
+
+ Text author = new Text(album.getUser().getUsername());
+ author.setFont(Font.font("System",24));
+
+ content.getChildren().addAll(authorLabel, author);
+ textContainer.getChildren().add(content);
+ }
+
+ /**
+ * Insert tags of the given album to the given container
+ *
+ * @param album the album which tags to display
+ * @param textContainer container for text elements of an album
+ */
+ private void insertAlbumTags(Album album, VBox textContainer) {
+ HBox content = new HBox();
+ Text tagsLabel = new Text("Tags: ");
+ tagsLabel.setFont(Font.font("System", FontWeight.BOLD, 16));
+
+ String tagsAsString = album.getTags().stream()
+ .map(Tag::getName)
+ .collect(Collectors.joining(" "));
+ Text tags = new Text(tagsAsString);
+ tags.setFont(Font.font("System",16));
+
+ content.getChildren().addAll(tagsLabel, tags);
+ textContainer.getChildren().add(content);
+ }
+
+
+ /**
+ * Insert description of the given album to the given container
+ *
+ * @param album the album which description to display
+ * @param textContainer container for text elements of an album
+ */
+ private void insertAlbumDescription(Album album, VBox textContainer) {
+ Text descriptionLabel = new Text("Description: ");
+ descriptionLabel.setFont(Font.font("System", FontWeight.BOLD, 16));
+
+ Text description = new Text(album.getDescription());
+ description.setWrappingWidth(500);
+ description.setFont(Font.font("System",16));
+
+
+ textContainer.getChildren().addAll(descriptionLabel, description);
+ }
+
+ /**
+ * Method that changes scene to Main page
+ * @param mouseEvent
+ * @throws IOException
+ */
+ public void switchToMain(MouseEvent mouseEvent) throws IOException {
+ App.setRoot("main");
+ }
+
+ /**
+ * Method that changes scene to Search page. It reads the value of the search
+ * field and if not empty it is passed to dataexchange
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToSearch(ActionEvent actionEvent) throws IOException {
+ if (!tbar_search.getText().isEmpty()){
+ App.ex.setSearchField(tbar_search.getText());
+ }
+ App.setRoot("search");
+ }
+
+ /**
+ * Method that changes scene to Explore page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToExplore(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore");
+ }
+
+ /**
+ * Method that changes scene to Albums page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
+
+ /**
+ * Method that changes scene to Map page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToMap(ActionEvent actionEvent) throws IOException {
+ App.setRoot("map");
+ }
+
+ /**
+ * Method that changes scene to Upload page
+ * @param actionEvent the mouse has done something
+ * @throws IOException this page does not exist
+ */
+ public void switchToUpload(ActionEvent actionEvent) throws IOException {
+ App.setRoot("upload");
+ }
+
+ /**
+ * Method that changes scene to Create Album page
+ * @param actionEvent the mouse has done something
+ * @throws IOException this page does not exist
+ */
+ public void switchToCreateAlbum(ActionEvent actionEvent) throws IOException {
+ App.setRoot("create_album");
+ }
+
+ /**
+ * Method that updates content to previous "page"
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToPrevious(ActionEvent actionEvent) throws IOException {
+ //TODO: Make method that updates content
+ }
+
+ /**
+ * Method that updates content to next "page"
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToNext(ActionEvent actionEvent) throws IOException {
+ //TODO: Make method that updates content
+ }
+
+ /**
+ * Method to open specific albums. It takes a clicked element within an album container
+ * and finds the fx:id of the main parent, (who's id is the same as the album in the database), and
+ * passes the value to Data Exchange so that Image View will know which album was clicked
+ * @param mouseEvent
+ * @throws IOException
+ */
+ public void switchToViewAlbum(MouseEvent mouseEvent) throws IOException {
+ boolean albumIdFound = false;
+ long albumId = 0;
+ Node node = (Node) mouseEvent.getSource();
+ while (!albumIdFound){
+ if (node.getId() != null){
+ albumId = Long.parseLong(node.getId());
+ albumIdFound = true;
+ }
+ node = node.getParent();
+ }
+
+ if (albumId != 0) {
+ App.ex.setChosenAlbumId(albumId);
+ App.setRoot("view_album");
+ }
+ }
+
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/ExploreController.java b/src/main/java/NTNU/IDATT1002/controllers/ExploreController.java
deleted file mode 100644
index 28dae0df85c2970efdecb2fdc09bacd4d2c30a65..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/ExploreController.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package NTNU.IDATT1002.controllers;
-
-import NTNU.IDATT1002.App;
-import javafx.event.ActionEvent;
-import javafx.scene.control.Button;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TextField;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
-
-import java.io.IOException;
-
-public class ExploreController {
- public ImageView tbar_logo;
- public TextField tbar_search;
- public Button tbar_map;
- public Button tbar_upload;
- public ScrollPane scrollpane;
- public Button footer_previous_page;
- public Button footer_next_page;
-
- public void switchToMain(MouseEvent mouseEvent) throws IOException {
- App.setRoot("logged-in");
- }
-
- public void switchToSearch(ActionEvent actionEvent) throws IOException{
- App.setRoot("search_page");
- }
-
- public void switchToMap(ActionEvent actionEvent) throws IOException{
- App.setRoot("map_page");
- }
-
- public void switchToUpload(ActionEvent actionEvent) throws IOException{
- App.setRoot("upload_page");
- }
-
- public void switchToPrevious(ActionEvent actionEvent) {
-
- }
-
- public void switchToNext(ActionEvent actionEvent) {
-
- }
-}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/LoggedInController.java b/src/main/java/NTNU/IDATT1002/controllers/LoggedInController.java
deleted file mode 100644
index 3d9b7dca96467f619957de708549fcc74de2fb11..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/LoggedInController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package NTNU.IDATT1002.controllers;
-
-import NTNU.IDATT1002.App;
-import javafx.event.ActionEvent;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextField;
-import javafx.scene.image.ImageView;
-
-import java.io.IOException;
-
-public class LoggedInController {
- public TextField tbar_search;
- public ImageView tbar_logo;
- public Button tbar_explore;
- public Button tbar_map;
- public Button tbar_upload;
- public Button main_upload;
- public Button tbar_searchButton;
-
- public void switchToSearch(ActionEvent actionEvent) throws IOException {
- App.setRoot("search_page");
- }
-
- public void switchToExplore(ActionEvent actionEvent) throws IOException {
- App.setRoot("explore_page");
- }
-
- public void switchToMap(ActionEvent actionEvent) {
-
- }
-
- public void switchToUpload(ActionEvent actionEvent) {
-
- }
-}
\ No newline at end of file
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Login.java b/src/main/java/NTNU/IDATT1002/controllers/Login.java
new file mode 100644
index 0000000000000000000000000000000000000000..a21a2c83eff5fa9331c1c71f5a404f86754631ee
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/Login.java
@@ -0,0 +1,62 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import NTNU.IDATT1002.service.UserService;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+import javafx.scene.text.Text;
+
+import javax.persistence.EntityManager;
+import java.io.IOException;
+
+/**
+ * Controls the buttons and changeable elements on login.fxml,
+ * the page where you log into the application
+ * @version 1.0 22.03.2020
+ */
+public class Login {
+
+
+ public TextField Username;
+ public PasswordField Password;
+ public Button signup;
+ public Button login;
+ public Text error_msg;
+ private UserService userService;
+
+ public Login() {
+ EntityManager entityManager = App.ex.getEntityManager();
+ userService = new UserService(entityManager);
+ }
+
+ /**
+ * Method that changes scene to Sign Up page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToSignup(ActionEvent actionEvent) throws IOException {
+ App.setRoot("signup");
+ }
+
+ /**
+ * Method that changes scene to Main page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void login(ActionEvent actionEvent) throws IOException {
+ String username = Username.getText();
+ String password = Password.getText();
+ if(userService.logIn(username, password)) {
+ App.setRoot("main");
+ }
+ else {
+ //Combination of username and password was not correct
+ Password.setText(null);
+ Password.setPromptText("*");
+ Password.setStyle("-fx-prompt-text-fill: red");
+ error_msg.setText("Incorrect username or password");
+ }
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/LoginController.java b/src/main/java/NTNU/IDATT1002/controllers/LoginController.java
deleted file mode 100644
index 1fd4db9edd06cc5c15e1a591111c0053c91f2ad5..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/LoginController.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package NTNU.IDATT1002.controllers;
-
-import java.io.IOException;
-
-import NTNU.IDATT1002.App;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-
-public class LoginController {
-
- @FXML
- public void switchToSecondary() throws IOException {
- App.setRoot("signup");
- }
-
-
- public void switchToLoggedIn(ActionEvent actionEvent) throws IOException {
- App.setRoot("logged-in");
- }
-}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Main.java b/src/main/java/NTNU/IDATT1002/controllers/Main.java
new file mode 100644
index 0000000000000000000000000000000000000000..958e34b16c4908132e296de6856b11be4d094a42
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/Main.java
@@ -0,0 +1,86 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextField;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+
+import java.io.IOException;
+
+/**
+ * Controls the buttons and changeable elements on main.fxml,
+ * a page where you explore albums
+ * @version 1.0 22.03.2020
+ */
+public class Main {
+
+ public ImageView tbar_logo;
+ public TextField tbar_search;
+ public Button tbar_searchBtn;
+ public Button tbar_explore;
+ public Button tbar_map;
+ public Button tbar_upload;
+
+ public Button uploadBtn;
+ public Button tbar_albums;
+
+ /**
+ * Method that changes scene to Main page
+ * @param mouseEvent
+ * @throws IOException
+ */
+ public void switchToMain(MouseEvent mouseEvent) throws IOException {
+ App.setRoot("main");
+ }
+
+ /**
+ * Method that changes scene to Search page. It reads the value of the search
+ * field and if not empty it is passed to dataexchange
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToSearch(ActionEvent actionEvent) throws IOException {
+ if (!tbar_search.getText().isEmpty()){
+ App.ex.setSearchField(tbar_search.getText());
+ }
+ App.setRoot("search");
+ }
+
+ /**
+ * Method that changes scene to Explore page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToExplore(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore");
+ }
+
+ /**
+ * Method that changes scene to Albums page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
+
+ /**
+ * Method that changes scene to Map page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToMap(ActionEvent actionEvent) throws IOException {
+ App.setRoot("map");
+ }
+
+ /**
+ * Method that changes scene to Upload page
+ * @param actionEvent the mouse has done something
+ * @throws IOException this page does not exist
+ */
+ public void switchToUpload(ActionEvent actionEvent) throws IOException {
+ App.setRoot("upload");
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Map.java b/src/main/java/NTNU/IDATT1002/controllers/Map.java
new file mode 100644
index 0000000000000000000000000000000000000000..06695a4d172b7bff6a9586eefd0b2fdacfb595d2
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/Map.java
@@ -0,0 +1,95 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextField;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+
+import java.io.IOException;
+
+/**
+ * Controls the buttons and changeable elements on map.fxml,
+ * a page where you can find images by location
+ * @version 1.0 22.03.2020
+ */
+public class Map {
+ public ImageView tbar_logo;
+ public TextField tbar_search;
+ public Button tbar_searchBtn;
+ public Button tbar_explore;
+ public Button tbar_map;
+ public Button tbar_upload;
+
+ public TextField search;
+ public Button searchBtn;
+ public Button tbar_albums;
+
+ /**
+ * Method that changes scene to Main page
+ * @param mouseEvent
+ * @throws IOException
+ */
+ public void switchToMain(MouseEvent mouseEvent) throws IOException {
+ App.setRoot("main");
+ }
+
+ /**
+ * Method that changes scene to Search page. It reads the value of the search
+ * field and if not empty it is passed to dataexchange
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToSearch(ActionEvent actionEvent) throws IOException {
+ if (!tbar_search.getText().isEmpty()){
+ App.ex.setSearchField(tbar_search.getText());
+ }
+ App.setRoot("search");
+ }
+
+ /**
+ * Method that changes scene to Explore page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToExplore(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore");
+ }
+
+ /**
+ * Method that changes scene to Albums page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
+
+ /**
+ * Method that changes scene to Map page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToMap(ActionEvent actionEvent) throws IOException {
+ App.setRoot("map");
+ }
+
+ /**
+ * Method that changes scene to Upload page
+ * @param actionEvent the mouse has done something
+ * @throws IOException this page does not exist
+ */
+ public void switchToUpload(ActionEvent actionEvent) throws IOException {
+ App.setRoot("upload");
+ }
+
+ /**
+ * Method that searches for images on a specific place
+ * @param actionEvent
+ */
+ public void MapSearch(ActionEvent actionEvent) {
+ //TODO: Make method
+ }
+}
+
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Search.java b/src/main/java/NTNU/IDATT1002/controllers/Search.java
new file mode 100644
index 0000000000000000000000000000000000000000..6a3724066afa4a28d9ae532887745db4fc16297a
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/Search.java
@@ -0,0 +1,206 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.fxml.Initializable;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ResourceBundle;
+import java.util.stream.Collectors;
+
+
+/**
+ * Controls the buttons and changeable elements on search.fxml,
+ * a page where you can search for images and sort them
+ * @version 1.0 22.03.2020
+ */
+public class Search implements Initializable {
+
+ public ImageView tbar_logo;
+ public TextField tbar_search;
+ public Button tbar_searchBtn;
+ public Button tbar_explore;
+ public Button tbar_map;
+ public Button tbar_upload;
+ public Button tbar_albums;
+
+ public Text search_result;
+ public ScrollPane scrollpane;
+ public ChoiceBox sorted_by_choicebox;
+ public VBox vBox;
+
+
+ /**
+ * Method that writes the word that is searched for.
+ * Also generates HBoxes with image title, tags...
+ * @param location
+ * @param resources
+ */
+ public void initialize(URL location, ResourceBundle resources) {
+ if (!App.ex.getSearchField().isEmpty()){
+ search_result.setText(App.ex.getSearchField());
+ }
+ List<String> urls = Arrays.asList("@../../Images/placeholder-1920x1080.png", "@../../Images/party.jpg", "@../../Images/placeholderLogo.png", "@../../Images/placeholder-1920x1080.png", "@../../Images/placeholder-1920x1080.png");
+ for(int i = 0; i < urls.size(); i++) {
+ HBox h = new HBox();
+ h.setPrefHeight(300);
+ h.setPrefWidth(1920);
+ h.setAlignment(Pos.CENTER);
+ h.setStyle("-fx-background-color: #999999;");
+
+ Pane p = new Pane();
+ p.setPrefWidth(1400);
+ p.setPrefHeight(300);
+
+ ImageView iV = new ImageView();
+ iV.setImage(new Image(urls.get(i)));
+ iV.setFitHeight(300);
+ iV.setFitWidth(500);
+ iV.pickOnBoundsProperty().setValue(true);
+ iV.setPreserveRatio(true);
+ iV.setOnMouseClicked(new EventHandler<MouseEvent>() {
+ @Override public void handle(MouseEvent e) {
+ try{
+ switchToPicture(e);
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+ }
+ });
+
+ Text title = setText("TITLE:", 550, 66, 153, "System Bold", 48);
+ Text tag = setText("TAG:", 550, 97, 70, "System Bold", 24);
+ Text desc = setText("DESCRIPTION:", 550, 126, 129, "System Bold", 18);
+ Text title_Field = setText(urls.get(i), 700, 66, "System Bold", 48);
+ Text tag_Field = setText("####", 700, 97, "System Bold", 24);
+ Text desc_Field = setText("####", 700, 126, "System Bold", 18);
+
+ p.getChildren().addAll(iV, title, tag, desc, title_Field, tag_Field, desc_Field);
+ h.getChildren().add(p);
+ vBox.getChildren().add(h);
+ }
+ }
+
+ public Text setText(String text, int layoutX, int layoutY, double wrappingWidth, String fontName, double fontSize){
+ Text t = new Text(text);
+ t.setLayoutX(layoutX);
+ t.setLayoutY(layoutY);
+ t.setWrappingWidth(wrappingWidth);
+ t.setFont(Font.font(fontName, fontSize));
+ return t;
+ }
+
+ public Text setText(String text, int layoutX, int layoutY, String fontName, double fontSize){
+ Text t = new Text(text);
+ t.setLayoutX(layoutX);
+ t.setLayoutY(layoutY);
+ t.setFont(Font.font(fontName, fontSize));
+ return t;
+ }
+
+ /**
+ * Method that changes scene to Main page
+ * @param mouseEvent
+ * @throws IOException
+ */
+ public void switchToMain(MouseEvent mouseEvent) throws IOException {
+ App.setRoot("main");
+ }
+
+ /**
+ * Method that changes scene to Search page. It reads the value of the search
+ * field and if not empty it is passed to dataexchange
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToSearch(ActionEvent actionEvent) throws IOException {
+ if (!tbar_search.getText().isEmpty()){
+ App.ex.setSearchField(tbar_search.getText());
+ }
+ App.setRoot("search");
+ }
+
+ /**
+ * Method that changes scene to Explore page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToExplore(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore");
+ }
+
+ /**
+ * Method that changes scene to Albums page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
+
+ /**
+ * Method that changes scene to Map page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToMap(ActionEvent actionEvent) throws IOException {
+ App.setRoot("map");
+ }
+
+ /**
+ * Method that changes scene to Upload page
+ * @param actionEvent the mouse has done something
+ * @throws IOException this page does not exist
+ */
+ public void switchToUpload(ActionEvent actionEvent) throws IOException {
+ App.setRoot("upload");
+ }
+
+ /**
+ * Method that updates content to previous "page"
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToPrevious(ActionEvent actionEvent) throws IOException {
+ //TODO: Make method that updates content to previous "page"
+ }
+
+ /**
+ * Method that updates content to next "page"
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToNext(ActionEvent actionEvent) throws IOException {
+ //TODO: Make method that updates content to next "page"
+ }
+
+ /**
+ * Method for opening the chosen picture.
+ * @param mouseEvent what is clicked on
+ * @throws IOException
+ */
+ public void switchToPicture(MouseEvent mouseEvent) throws IOException {
+ if(mouseEvent.getSource() instanceof ImageView){
+ App.ex.setChosenImg(((ImageView) mouseEvent.getSource()).getImage().getUrl());
+ App.setRoot("view_picture");
+ }
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/SearchPageController.java b/src/main/java/NTNU/IDATT1002/controllers/SearchPageController.java
deleted file mode 100644
index 4faf8fe09f50973651468b117dffc546818a4cf1..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/SearchPageController.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package NTNU.IDATT1002.controllers;
-
-import NTNU.IDATT1002.App;
-import javafx.event.ActionEvent;
-import javafx.scene.control.Button;
-import javafx.scene.control.ScrollPane;
-import javafx.scene.control.TextField;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
-
-import java.io.IOException;
-
-public class SearchPageController {
- public ImageView tbar_logo;
- public TextField tbar_search;
- public Button tbar_map;
- public Button tbar_upload;
- public ScrollPane scrollpane;
- public Button footer_previous_page;
- public Button footer_next_page;
- public ImageView tbar_logo1;
- public TextField tbar_search1;
- public Button tbar_map1;
- public Button tbar_upload1;
-
- public void switchToSearch(ActionEvent actionEvent) {
-
- }
-
- public void switchToMain(MouseEvent mouseEvent) {
-
- }
-
- public void switchToMap(ActionEvent actionEvent) {
-
- }
-
- public void switchToUpload(ActionEvent actionEvent) {
-
- }
-
- public void switchToPrevious(ActionEvent actionEvent) {
-
- }
-
- public void switchToNext(ActionEvent actionEvent) throws IOException {
- App.setRoot("search_page_2");
- }
-}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/SignUp.java b/src/main/java/NTNU/IDATT1002/controllers/SignUp.java
new file mode 100644
index 0000000000000000000000000000000000000000..07d2c1e2eec7117fd84f0d1853e9ae77daff5d99
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/SignUp.java
@@ -0,0 +1,107 @@
+package NTNU.IDATT1002.controllers;
+
+import java.io.IOException;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Optional;
+
+import NTNU.IDATT1002.App;
+import NTNU.IDATT1002.service.UserService;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+import javafx.scene.control.DatePicker;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import javafx.scene.text.Text;
+
+import javax.persistence.EntityManager;
+import java.io.IOException;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+
+/**
+ * Controls the buttons and changeable elements on signup.fxml,
+ * a page where you create a new user for the application
+ * @version 1.0 22.03.2020
+ */
+public class SignUp {
+
+ public GridPane signup_form;
+ public TextField signup_firstName;
+ public TextField signup_lastName;
+ public TextField signup_username;
+ public TextField signup_email;
+ public PasswordField signup_password;
+ public TextField signup_phoneCode;
+ public TextField signup_phoneNr;
+ public DatePicker signup_birthDate;
+
+ public Text signup_error;
+ public UserService userService;
+
+ public Button signup_btn;
+
+ public SignUp() {
+ EntityManager entityManager = App.ex.getEntityManager();
+ userService = new UserService(entityManager);
+ }
+
+ /**
+ * Method that changes scene to Login
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void signup(ActionEvent actionEvent) throws IOException {
+ String username = signup_username.getText();
+ String firstName = signup_firstName.getText();
+ String lastName = signup_lastName.getText();
+ String email = signup_email.getText();
+ String password = signup_password.getText();
+ String phoneCode = signup_phoneCode.getText();
+ String phoneNr = signup_phoneNr.getText();
+
+ ArrayList<TextField> signupFields = new ArrayList<>();
+ signupFields.add(signup_firstName);
+ signupFields.add(signup_lastName);
+ signupFields.add(signup_username);
+ signupFields.add(signup_email);
+ signupFields.add(signup_password);
+ signupFields.add(signup_phoneCode);
+ signupFields.add(signup_phoneNr);
+ boolean blank = false;
+ for (TextField signupField : signupFields) {
+ if (signupField.getText().trim().isEmpty()){
+ signupField.setPromptText("*");
+ signupField.setStyle("-fx-prompt-text-fill: red");
+ blank = true;
+ }
+ }
+
+ if (signup_birthDate.getValue() == null){
+ signup_birthDate.setPromptText("*");
+ signup_error.setText("* fields required to sign up");
+ }
+ else if (blank) {
+ signup_error.setText("* fields required to sign up");
+ }
+ else{
+ LocalDate birthLocalDate = signup_birthDate.getValue();
+ Instant instant = Instant.from(birthLocalDate.atStartOfDay(ZoneId.systemDefault()));
+ Date birthDate = Date.from(instant);
+ if(userService.createUser(email, username, firstName, lastName, phoneCode, phoneNr, birthDate, password).isPresent()) {
+ //TODO: Return message to user to confirm that user has been succsessfully registered
+ App.setRoot("login");
+ }
+ }
+ }
+
+ public void cancel(ActionEvent event) throws IOException {
+ App.setRoot("login");
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/SignUpController.java b/src/main/java/NTNU/IDATT1002/controllers/SignUpController.java
deleted file mode 100644
index 29be8feeee66493b2712950a230d29d97eada3b5..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/SignUpController.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package NTNU.IDATT1002.controllers;
-
-import java.io.IOException;
-
-import NTNU.IDATT1002.App;
-import javafx.fxml.FXML;
-
-public class SignUpController {
-
- @FXML
- public void switchToPrimary() throws IOException {
- App.setRoot("login");
- }
-}
\ No newline at end of file
diff --git a/src/main/java/NTNU/IDATT1002/controllers/Upload.java b/src/main/java/NTNU/IDATT1002/controllers/Upload.java
new file mode 100644
index 0000000000000000000000000000000000000000..10156152dfada3301517c84f99401283da5445e6
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/Upload.java
@@ -0,0 +1,204 @@
+/**
+ * Controls the buttons and changable elements on upload page
+ * @version 1.0 17.03.2020
+ * @author Simon Jensen
+ */
+
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextField;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.DragEvent;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.input.TransferMode;
+import javafx.scene.layout.Pane;
+import javafx.stage.FileChooser;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Controls the buttons and changeable elements on upload.fxml,
+ * a page where you select images to upload
+ * @version 1.0 22.03.2020
+ */
+public class Upload {
+ public ImageView tbar_logo;
+ public TextField tbar_search;
+ public Button tbar_searchBtn;
+ public Button tbar_explore;
+ public Button tbar_map;
+ public Button tbar_upload;
+
+ public Button uploadBtn;
+ public Pane drag_drop;
+ public Button tbar_albums;
+
+ /**
+ * Method that changes scene to Main page
+ * @param mouseEvent
+ * @throws IOException
+ */
+ public void switchToMain(MouseEvent mouseEvent) throws IOException {
+ App.setRoot("main");
+ }
+
+ /**
+ * Method that changes scene to Search page. It reads the value of the search
+ * field and if not empty it is passed to dataexchange
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToSearch(ActionEvent actionEvent) throws IOException {
+ if (!tbar_search.getText().isEmpty()){
+ App.ex.setSearchField(tbar_search.getText());
+ }
+ App.setRoot("search");
+ }
+
+ /**
+ * Method that changes scene to Explore page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToExplore(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore");
+ }
+
+ /**
+ * Method that changes scene to Albums page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
+
+ /**
+ * Method that changes scene to Map page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToMap(ActionEvent actionEvent) throws IOException {
+ App.setRoot("map");
+ }
+
+ /**
+ * Method that changes scene to Upload page
+ * @param actionEvent the mouse has done something
+ * @throws IOException this page does not exist
+ */
+ public void switchToUpload(ActionEvent actionEvent) throws IOException {
+ App.setRoot("upload");
+ }
+
+ /**
+ * Method that changs scene to Uploaded Single page
+ * If the user has chosen 1 image this method is called
+ * @throws IOException
+ */
+ private void switchToUploadedSingle() throws IOException {
+ App.setRoot("uploaded_single");
+ }
+
+ /**
+ * Method that changs scene to Uploaded Multiple page
+ * If the user has chosen multiple images this method is called
+ * @throws IOException
+ */
+ private void switchToUploadedMultiple() throws IOException {
+ App.setRoot("uploaded_multiple");
+ }
+
+
+
+
+ /**
+ * Method that opens file browser with an image filter
+ * The user will choose what files to upload
+ * @throws IOException
+ */
+ public void chooseFile() throws IOException {
+ FileChooser fileChooser = new FileChooser();
+ fileChooser.setTitle("Choose files to upload");
+ fileChooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Image Files", "*.png","*.jpg", "*.jpeg"));
+ // Show save file dialog
+ List<File> list = fileChooser.showOpenMultipleDialog(uploadBtn.getScene().getWindow());
+
+ if(!list.isEmpty()){
+ //Store files in DataExchange
+ App.ex.setUploadedFiles(list);
+ if (list.size() == 1){
+ switchToUploadedSingle();
+ }
+ else {
+ switchToUploadedMultiple();
+ }
+ }
+ }
+
+ /**
+ * Method that finds the extension of a file
+ * @param fileName the name of the file (img.jpg, img2.png ect.)
+ * @return file extension (jpg, png ect.)
+ */
+ public String getExtension(String fileName){
+ String extension = "";
+
+ int i = fileName.lastIndexOf('.');
+ //if the name is not empty
+ if (i > 0 && i < fileName.length() - 1){
+ return fileName.substring(i + 1).toLowerCase();
+ }
+ return extension;
+ }
+
+ /**
+ * Method that decides if something can be dropped
+ * The method is called whenever something is hoovered over the drag-drop pane
+ * @param event something is dragged over the container
+ */
+ public void acceptDrop(DragEvent event) {
+ //TODO: Choose valid file types
+ List<String> validExtensions = Arrays.asList("jpg", "png", "jpeg");
+ //Checks if the event contains files
+ if(event.getDragboard().hasFiles()){
+ //If not all files hoovered is in validExtension
+ if (!validExtensions.containsAll(
+ event.getDragboard().getFiles().stream()
+ .map(file -> getExtension(file.getName()))
+ .collect(Collectors.toList()))) {
+
+ event.consume();
+ return;
+ }
+ //Makes it possible to transfer/drop the files
+ event.acceptTransferModes(TransferMode.ANY);
+ }
+ }
+
+ /**
+ * Method that stores the dropped files
+ * @param event something is dropped into the container
+ * @throws IOException
+ */
+ public void droppedFiles(DragEvent event) throws IOException {
+ List<File> list = event.getDragboard().getFiles();
+ if(!list.isEmpty()){
+ //Stores files to DataExchange
+ App.ex.setUploadedFiles(list);
+ if (list.size() == 1){
+ switchToUploadedSingle();
+ }
+ else {
+ switchToUploadedMultiple();
+ }
+ }
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/UploadController.java b/src/main/java/NTNU/IDATT1002/controllers/UploadController.java
deleted file mode 100644
index 27998d535eb00db737ed82530d374eecd12cd514..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/UploadController.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Controls the buttons and changable elements on upload page
- * @version 1.0 17.03.2020
- * @author Simon Jensen
- */
-
-package NTNU.IDATT1002.controllers;
-
-import NTNU.IDATT1002.App;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextField;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.input.DragEvent;
-import javafx.scene.input.KeyEvent;
-import javafx.scene.input.TransferMode;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.VBox;
-import javafx.stage.FileChooser;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class UploadController {
- public Button uploadBtn;
- public VBox thumbnailsField;
- public Pane dragDropField;
- public TextField searchField;
-
- /**
- * Method that changes stage to Explore page
- * @throws IOException
- */
- public void switchToExplore() throws IOException {
- App.setRoot("explore");
- }
-
- /**
- * Method that changes stage to Album page
- * @throws IOException
- */
- public void switchToAlbum() throws IOException {
- App.setRoot("album");
- }
-
- /**
- * Method that changes stage to Map page
- * @throws IOException
- */
- public void switchToMap() throws IOException {
- App.setRoot("map");
- }
-
- /**
- * Method for searching by tags, ect.
- * @param keyEvent
- */
- public void search(KeyEvent keyEvent) {
- //TODO: Make search method
- }
-
- /**
- * Method that opens filebrowser with an image filter.
- * The user chooses what files to upload
- * @throws MalformedURLException
- */
- public void chooseFile() throws MalformedURLException {
- FileChooser fileChooser = new FileChooser();
- fileChooser.setTitle("Choose image files");
- fileChooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Image Files", "*.png","*.jpg", "*.jpeg"));
- // Show save file dialog
- List<File> list = fileChooser.showOpenMultipleDialog(uploadBtn.getScene().getWindow());
-
- if (list != null){
- for (File file : list){
- //Made a method to confirm that the images was uploaded correctly
- addThumbnail(file);
- }
- }
- }
-
- /**
- * Method that finds the extension/filetype
- * @param fileName the name of the file (img.jpg ect.)
- * @return file extension (jpg, png ect.)
- */
- public String getExtension(String fileName){
- String extension = "";
-
- int i = fileName.lastIndexOf('.');
- //if the name is not empty
- if (i > 0 && i < fileName.length() - 1){
- return fileName.substring(i + 1).toLowerCase();
- }
- return extension;
- }
-
- /**
- * Method that decides whenever the file hoovered over the pane is valid or not.
- * Called when something is hoovered over the pane.
- * @param event something is dragged over the container
- */
- public void acceptDrop(DragEvent event) {
- // Extensions that are valid to be drag-n-dropped
- //TODO: Choose valid file types
- List<String> validExtensions = Arrays.asList("jpg", "png", "jpeg");
- //Checks if the event contains files
- if(event.getDragboard().hasFiles()){
- if (!validExtensions.containsAll(
- //Makes a list out of the events file extensions
- event.getDragboard().getFiles().stream()
- .map(file -> getExtension(file.getName()))
- .collect(Collectors.toList()))) {
-
- event.consume();
- return;
- }
- //Makes it possible to transfer the files
- event.acceptTransferModes(TransferMode.ANY);
- }
- }
-
- /**
- * Method that stores the dropped files. It is not possible to transfer files
- * without them already being accepted in acceptDrop() method.
- * @param event something is dropped into the container
- * @throws MalformedURLException
- */
- public void droppedFiles(DragEvent event) throws MalformedURLException {
- List<File> list = event.getDragboard().getFiles();
- for (File file : list){
- addThumbnail(file);
- }
- }
-
- /**
- * Test-method to confirm that the image drop went well
- * @param file an image file
- * @throws MalformedURLException
- */
- //TODO: Remove method?
- public void addThumbnail(File file) throws MalformedURLException {
- Image image = new Image(file.toURI().toURL().toString());
- ImageView view = new ImageView();
- view.setImage(image);
-
- //setting the fit height and width of the image view
- view.setFitHeight(30);
- view.setFitWidth(30);
-
- thumbnailsField.getChildren().add(view);
- }
-}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/UploadedAlbumController.java b/src/main/java/NTNU/IDATT1002/controllers/UploadedAlbumController.java
deleted file mode 100644
index e3cf6461c363d9964e85e69a9b2eecbc6a6b73fd..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/UploadedAlbumController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package NTNU.IDATT1002.controllers;
-
-import NTNU.IDATT1002.App;
-import javafx.event.ActionEvent;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
-import javafx.scene.image.ImageView;
-
-import java.io.IOException;
-
-public class UploadedAlbumController {
- public TextField tbar_search;
- public ImageView tbar_logo;
- public Button tbar_explore;
- public Button tbar_map;
- public Button tbar_upload;
- public Button accept_button;
- public TextField title_field;
- public TextField tag_field;
- public TextArea desc_field;
- public ImageView uploaded_image;
-
- public void switchToSearch(ActionEvent actionEvent) {
-
- }
-
- public void switchToUpload(ActionEvent actionEvent) {
-
- }
-
- public void switchToMap(ActionEvent actionEvent) {
-
- }
-
- public void switchToExplore(ActionEvent actionEvent) {
-
- }
-
- public void uploadAlbum(ActionEvent actionEvent) throws IOException {
- //write method to accept and upload the photo with chosen settings, titles etc and then setRoot to logged-in page
- App.setRoot("logged-in");
- }
-}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/UploadedMultiple.java b/src/main/java/NTNU/IDATT1002/controllers/UploadedMultiple.java
new file mode 100644
index 0000000000000000000000000000000000000000..9fdbacf293c5f94612d0e771ebfe184161fa41f1
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/UploadedMultiple.java
@@ -0,0 +1,119 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+
+import java.io.IOException;
+
+/**
+ * Controls the buttons and changeable elements on upload_multiple.fxml,
+ * a page where you add descriptions to your selected images
+ * @version 1.0 22.03.2020
+ */
+public class UploadedMultiple {
+
+
+ public ImageView tbar_logo;
+ public TextField tbar_search;
+ public Button tbar_searchBtn;
+ public Button tbar_explore;
+ public Button tbar_map;
+ public Button tbar_upload;
+
+ public TextField photo_title;
+ public TextField photo_tag;
+ public TextArea photo_desc;
+ public ImageView photo_image;
+
+ public TextField photo_title2;
+ public TextField photo_tag2;
+ public TextArea photo_desc2;
+ public ImageView photo_image2;
+
+ public TextField photo_title3;
+ public TextField photo_tag3;
+ public TextArea photo_desc3;
+ public ImageView photo_image3;
+
+ public TextField photo_title4;
+ public TextField photo_tag4;
+ public TextArea photo_desc4;
+ public ImageView photo_image4;
+
+ public Button acceptBtn;
+ public Button tbar_albums;
+
+ /**
+ * Method that changes scene to Main page
+ * @param mouseEvent
+ * @throws IOException
+ */
+ public void switchToMain(MouseEvent mouseEvent) throws IOException {
+ App.setRoot("main");
+ }
+
+ /**
+ * Method that changes scene to Search page. It reads the value of the search
+ * field and if not empty it is passed to dataexchange
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToSearch(ActionEvent actionEvent) throws IOException {
+ if (!tbar_search.getText().isEmpty()){
+ App.ex.setSearchField(tbar_search.getText());
+ }
+ App.setRoot("search");
+ }
+
+ /**
+ * Method that changes scene to Explore page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToExplore(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore");
+ }
+
+ /**
+ * Method that changes scene to Albums page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
+
+ /**
+ * Method that changes scene to Map page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToMap(ActionEvent actionEvent) throws IOException {
+ App.setRoot("map");
+ }
+
+ /**
+ * Method that changes scene to Upload page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToUpload(ActionEvent actionEvent) throws IOException {
+ App.setRoot("upload");
+ }
+
+ /**
+ * Method for uploading several images to database with title, tags and description
+ * Image itself is not stored but URL is
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void uploadMultiple(ActionEvent actionEvent) throws IOException {
+ //TODO: write method to accept and upload the photo with chosen settings, titles..
+ App.setRoot("main");
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/UploadedPhotoController.java b/src/main/java/NTNU/IDATT1002/controllers/UploadedPhotoController.java
deleted file mode 100644
index 8dff5fd25a2351e9a0870d46eb9fbf2586bf2bc5..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/controllers/UploadedPhotoController.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package NTNU.IDATT1002.controllers;
-
-import NTNU.IDATT1002.App;
-import javafx.event.ActionEvent;
-import javafx.scene.control.Button;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
-import javafx.scene.image.ImageView;
-
-import java.io.IOException;
-
-public class UploadedPhotoController {
- public TextField tbar_search;
- public ImageView tbar_logo;
- public Button tbar_explore;
- public Button tbar_map;
- public Button tbar_upload;
- public TextField title_field;
- public TextField tag_field;
- public TextArea desc_field;
- public Button accept_button;
- public ImageView uploaded_image;
-
- public void switchToSearch(ActionEvent actionEvent) {
-
- }
-
- public void switchToUpload(ActionEvent actionEvent) {
-
- }
-
- public void switchToMap(ActionEvent actionEvent) {
-
- }
-
- public void switchToExplore(ActionEvent actionEvent) {
-
- }
-
- public void uploadPhoto(ActionEvent actionEvent) throws IOException {
- //write method to accept and upload the photo with chosen settings, titles etc and then setRoot to logged-in page
- App.setRoot("logged-in");
- }
-}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/UploadedSingle.java b/src/main/java/NTNU/IDATT1002/controllers/UploadedSingle.java
new file mode 100644
index 0000000000000000000000000000000000000000..9321eba6df93ba61fbf9055f42abc0b271495929
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/UploadedSingle.java
@@ -0,0 +1,152 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import NTNU.IDATT1002.ApplicationState;
+import NTNU.IDATT1002.models.Tag;
+import NTNU.IDATT1002.repository.TagRepository;
+import NTNU.IDATT1002.service.ImageService;
+import NTNU.IDATT1002.service.TagService;
+import javafx.event.ActionEvent;
+import javafx.fxml.Initializable;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+
+import javax.persistence.EntityManager;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ResourceBundle;
+
+/**
+ * Controls the buttons and changeable elements on upload_single.fxml,
+ * a page where you add descriptions to your selected image
+ *
+ * @version 1.0 22.03.2020
+ */
+public class UploadedSingle implements Initializable {
+
+ ImageService imageService;
+
+ public ImageView tbar_logo;
+ public TextField tbar_search;
+ public Button tbar_searchBtn;
+ public Button tbar_explore;
+ public Button tbar_map;
+ public Button tbar_upload;
+
+ public TextField photo_title;
+ public TextField photo_tag;
+ public TextArea photo_desc;
+ public ImageView photo_image;
+
+ public Button acceptBtn;
+ public Button tbar_albums;
+
+
+ /**
+ * Method that runs when the controller is loaded
+ * Sets the image url on the page to be the uploaded images url
+ *
+ * @param location
+ * @param resources
+ */
+ public void initialize(URL location, ResourceBundle resources) {
+ photo_image.setImage(new Image(App.ex.getUploadedFiles()
+ .get(0)
+ .toURI()
+ .toString()));
+
+ EntityManager entityManager = App.ex.getEntityManager();
+ imageService = new ImageService(entityManager);
+ }
+
+ /**
+ * Method that changes stage to Main page
+ *
+ * @param mouseEvent
+ * @throws IOException
+ */
+ public void switchToMain(MouseEvent mouseEvent) throws IOException {
+ App.setRoot("main");
+ }
+
+ /**
+ * Method that changes stage to Search page. It reads the value of the search
+ * field and if not empty it is passed to dataexchange
+ *
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToSearch(ActionEvent actionEvent) throws IOException {
+ if (!tbar_search.getText().isEmpty()) {
+ App.ex.setSearchField(tbar_search.getText());
+ }
+ App.setRoot("search");
+ }
+
+ /**
+ * Method that changes stage to Explore page
+ *
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToExplore(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore");
+ }
+
+ /**
+ * Method that changes stage to Albums page
+ *
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
+
+ /**
+ * Method that changes stage to Map page
+ *
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToMap(ActionEvent actionEvent) throws IOException {
+ App.setRoot("map");
+ }
+
+ /**
+ * Method that changes stage to Upload page
+ *
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToUpload(ActionEvent actionEvent) throws IOException {
+ App.setRoot("upload");
+ }
+
+ /**
+ * Method for uploading image to database with tags
+ * Image itself is not stored but URL is
+ *
+ * @author Lars ØStby
+ * @param actionEvent
+ * @throws IOException
+ */
+
+ public void uploadSingle(ActionEvent actionEvent) throws IOException {
+ List<File> list = App.ex.getUploadedFiles();
+ File file = list.get(0);
+ List<Tag> tags = TagService.getTagsFromString(photo_tag.getText());
+ imageService.createImage(ApplicationState.getCurrentUser(), file, tags);
+ App.setRoot("main");
+ }
+
+
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/ViewAlbum.java b/src/main/java/NTNU/IDATT1002/controllers/ViewAlbum.java
new file mode 100644
index 0000000000000000000000000000000000000000..65513152d5e6187e1dfdfe4890d5300d00b85034
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/ViewAlbum.java
@@ -0,0 +1,349 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import NTNU.IDATT1002.models.Album;
+import NTNU.IDATT1002.models.Tag;
+import NTNU.IDATT1002.service.AlbumDocument;
+import NTNU.IDATT1002.service.AlbumService;
+import NTNU.IDATT1002.utils.ImageUtil;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Optional;
+import java.util.ResourceBundle;
+import java.util.logging.Logger;
+import javafx.application.HostServices;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.geometry.Insets;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontWeight;
+import javafx.scene.text.Text;
+import javax.persistence.EntityManager;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.EntityManager;
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Optional;
+import java.util.ResourceBundle;
+import java.util.stream.Collectors;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Controls the buttons and changeable elements on view_album.fxml,
+ * a page where get a more detailed view of an album
+ * @version 1.0 22.03.2020
+ */
+public class ViewAlbum implements Initializable {
+ public TextField tbar_search;
+ public ImageView tbar_logo;
+ public Button tbar_explore;
+ public Button tbar_map;
+ public Button tbar_upload;
+ public Button tbar_searchBtn;
+ public Button tbar_albums;
+ public Pane metadataPane;
+ public Button createAlbumPdf;
+ public ImageView mainPicture;
+ public Text pictureTitleField;
+ public Text pictureTagsField;
+
+ @FXML
+ public VBox albumTextContainer;
+ public HBox albumImages;
+
+ private AlbumService albumService;
+ private Album currentAlbum;
+
+
+
+ /**
+ * Initialize view with real album data.
+ *
+ * @param url
+ * @param resourceBundle
+ */
+ @Override
+ public void initialize(URL url, ResourceBundle resourceBundle) {
+ EntityManager entityManager = App.ex.getEntityManager();
+ albumService = new AlbumService(entityManager);
+ Long currentAlbumId = App.ex.getChosenAlbumId();
+
+ Optional<Album> foundAlbum = albumService.getAlbumById(currentAlbumId);
+ foundAlbum.ifPresent(album -> {
+ currentAlbum = album;
+ NTNU.IDATT1002.models.Image titleImage = album.getImages().get(0);
+ Image image = ImageUtil.convertToFXImage(titleImage);
+ mainPicture.setImage(image);
+ pictureTitleField.setText("LEGG TIL BILDETITTEL HER");
+ pictureTagsField.setText("#LEGG #TIL #TAGS #HER");
+ insertAlbumTextToContainer(album);
+ for (NTNU.IDATT1002.models.Image i: album.getImages()) {
+ ImageView iV = new ImageView();
+ iV.setFitHeight(64);
+ iV.setFitWidth(114);
+ iV.setPreserveRatio(true);
+ iV.setId(i.getId().toString());
+ iV.setImage(ImageUtil.convertToFXImage(i));
+ albumImages.getChildren().add(iV);
+ iV.setOnMouseClicked(new EventHandler<MouseEvent>() {
+ @Override public void handle(MouseEvent mouseEvent) {
+ setActiveImage(mouseEvent);
+ }
+ });
+ }
+ });
+ }
+
+ /**
+ * Changes the current main picture
+ * //TODO: Make it change main picture title and tags
+ * @param mouseEvent something is clicked
+ */
+ private void setActiveImage(MouseEvent mouseEvent) {
+ Object clickedObject = mouseEvent.getSource();
+ if (clickedObject instanceof ImageView) {
+ ImageView clickedImageView = (ImageView) mouseEvent.getSource();
+ Long clickedImageId = Long.parseLong(clickedImageView.getId());
+ Optional<NTNU.IDATT1002.models.Image> newImage = currentAlbum.getImages().stream().filter(img -> img.getId().equals(clickedImageId)).findFirst();
+ newImage.ifPresent(img -> {
+ Image image = ImageUtil.convertToFXImage(img);
+ mainPicture.setImage(image);
+ });
+ }
+ }
+
+ /**
+ * Att text elements from album to the container
+ *
+ * @param album the album to display
+ */
+ private void insertAlbumTextToContainer(Album album) {
+ //Creates a vbox so that nodes is aligned in a column
+ albumTextContainer.setSpacing(5);
+ albumTextContainer.setPadding(new Insets(0, 0, 20, 0));
+
+ insertAlbumTitle(album, albumTextContainer);
+ insertAlbumAuthor(album, albumTextContainer);
+ insertAlbumTags(album, albumTextContainer);
+ insertAlbumDescription(album, albumTextContainer);
+ }
+
+ /**
+ * Insert title of the given album to the given container
+ * It is clickable, and switches to View Album page of that album
+ *
+ * @param album the album which title to display
+ * @param textContainer container for text elements of an album
+ */
+ private void insertAlbumTitle(Album album, VBox textContainer) {
+ HBox content = new HBox();
+
+ Text titleLabel = new Text("Title: ");
+ titleLabel.setFont(Font.font("System", FontWeight.BOLD, 48));
+
+ Text title = new Text(album.getTitle());
+ title.setFont(Font.font("System",48));
+
+ content.getChildren().addAll(titleLabel, title);
+
+ textContainer.getChildren().add(content);
+ }
+
+ /**
+ * Insert author of the given album to the given container
+ *
+ * @param album the album which author to display
+ * @param textContainer container for text elements of an album
+ */
+ private void insertAlbumAuthor(Album album, VBox textContainer) {
+ HBox content = new HBox();
+ Text authorLabel = new Text("Author: ");
+ authorLabel.setFont(Font.font("System", FontWeight.BOLD, 24));
+
+ Text author = new Text(album.getUser().getUsername());
+ author.setFont(Font.font("System",24));
+
+ content.getChildren().addAll(authorLabel, author);
+ textContainer.getChildren().add(content);
+ }
+
+ /**
+ * Insert tags of the given album to the given container
+ *
+ * @param album the album which tags to display
+ * @param textContainer container for text elements of an album
+ */
+ private void insertAlbumTags(Album album, VBox textContainer) {
+ HBox content = new HBox();
+ Text tagsLabel = new Text("Tags: ");
+ tagsLabel.setFont(Font.font("System", FontWeight.BOLD, 16));
+
+ String tagsAsString = album.getTags().stream()
+ .map(Tag::getName)
+ .collect(Collectors.joining(" "));
+ Text tags = new Text(tagsAsString);
+ tags.setFont(Font.font("System",16));
+
+ content.getChildren().addAll(tagsLabel, tags);
+ textContainer.getChildren().add(content);
+ }
+
+
+ /**
+ * Insert description of the given album to the given container
+ *
+ * @param album the album which description to display
+ * @param textContainer container for text elements of an album
+ */
+ private void insertAlbumDescription(Album album, VBox textContainer) {
+ Text descriptionLabel = new Text("Description: ");
+ descriptionLabel.setFont(Font.font("System", FontWeight.BOLD, 16));
+
+ Text description = new Text(album.getDescription());
+ description.setWrappingWidth(500);
+ description.setFont(Font.font("System",16));
+
+
+ textContainer.getChildren().addAll(descriptionLabel, description);
+ }
+
+ /**
+ * Method that changes scene to Main page
+ * @param mouseEvent
+ * @throws IOException
+ */
+ public void switchToMain(MouseEvent mouseEvent) throws IOException {
+ App.setRoot("main");
+ }
+
+ /**
+ * Method that changes scene to Search page. It reads the value of the search
+ * field and if not empty it is passed to dataexchange
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToSearch(ActionEvent actionEvent) throws IOException {
+ if (!tbar_search.getText().isEmpty()){
+ App.ex.setSearchField(tbar_search.getText());
+ }
+ App.setRoot("search");
+ }
+
+ /**
+ * Method that changes scene to Explore page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToExplore(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore");
+ }
+
+ /**
+ * Method that changes scene to Albums page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
+
+ /**
+ * Method that changes scene to Map page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToMap(ActionEvent actionEvent) throws IOException {
+ App.setRoot("map");
+ }
+
+ /**
+ * Method that changes scene to Upload page
+ * @param actionEvent the mouse has done something
+ * @throws IOException this page does not exist
+ */
+ public void switchToUpload(ActionEvent actionEvent) throws IOException {
+ App.setRoot("upload");
+ }
+
+ public void openPopUpPicture(MouseEvent mouseEvent) {
+ //write method that opens a pop-up view of the main picture
+ }
+
+ public void changeMainPicture1(MouseEvent mouseEvent) {
+ //write method that switches to main picture to be picture 1 in the scrollbar-view
+ }
+
+ public void changeMainPicture2(MouseEvent mouseEvent) {
+ //write method that switches to main picture to be picture 2 in the scrollbar-view
+ }
+
+ public void changeMainPicture3(MouseEvent mouseEvent) {
+ //write method that switches to main picture to be picture 3 in the scrollbar-view
+ }
+
+ public void changeMainPicture4(MouseEvent mouseEvent) {
+ //write method that switches to main picture to be picture 4 in the scrollbar-view
+ }
+
+ public void changeMainPicture5(MouseEvent mouseEvent) {
+ //write method that switches to main picture to be picture 5 in the scrollbar-view
+ }
+
+ public void changeMainPicture6(MouseEvent mouseEvent) {
+ //write method that switches to main picture to be picture 6 in the scrollbar-view
+ }
+
+ public void loadPreviousScrollbarView(ActionEvent actionEvent) {
+ //write method that loads the previous 6 images in the album into the scrollbar-view
+ }
+
+ public void loadNextScrollbarView(ActionEvent actionEvent) {
+ //write method that loads the next 6 images in the album into the scrollbar-view
+ }
+
+ /**
+ * Retrieve and display album document.
+ *
+ * @param actionEvent
+ */
+ public void createPdf(ActionEvent actionEvent) {
+ Long currentAlbumId = App.ex.getChosenAlbumId();
+ AlbumDocument document = albumService.getDocument(currentAlbumId);
+
+ displayDocumentLink(document.getDocument());
+ }
+
+ /**
+ * Replace create album pdf button with a button to open the given document.
+ *
+ * @param pdfDocument the pdf document to be opened
+ */
+ private void displayDocumentLink(File pdfDocument) {
+ createAlbumPdf.setText("Open PDF");
+ createAlbumPdf.setOnAction(actionEvent -> openDocument(actionEvent, pdfDocument));
+ }
+
+ /**
+ * Open given file.
+ *
+ * @param actionEvent
+ * @param file the file to open
+ */
+ private void openDocument(ActionEvent actionEvent, File file) {
+ HostServices hostServices = App.ex.getHostServices();
+ hostServices.showDocument(file.getAbsolutePath());
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/controllers/ViewPicture.java b/src/main/java/NTNU/IDATT1002/controllers/ViewPicture.java
new file mode 100644
index 0000000000000000000000000000000000000000..d13613a22510c6cbf0451ff51d9108fb013f5633
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/controllers/ViewPicture.java
@@ -0,0 +1,108 @@
+package NTNU.IDATT1002.controllers;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.fxml.Initializable;
+import javafx.scene.control.Button;
+import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.Pane;
+import javafx.scene.text.Text;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.ResourceBundle;
+
+
+/**
+ * Controls the buttons and changeable elements on view_.fxml,
+ * a page where get a more detailed view of a picture
+ * @version 1.0 22.03.2020
+ */
+public class ViewPicture implements Initializable{
+ public ImageView tbar_logo;
+ public TextField tbar_search;
+ public Button tbar_explore;
+ public Button tbar_map;
+ public Button tbar_upload;
+ public ImageView picture;
+ public Text picture_tagsField;
+ public Text picture_title_field;
+ public Text picture_descField;
+ public Pane metadata_pane;
+ public Button tbar_searchBtn;
+ public Button tbar_albums;
+
+ @Override
+ public void initialize(URL url, ResourceBundle resourceBundle) {
+ picture.setImage(new Image(App.ex.getChosenImg()));
+ }
+
+ /**
+ * Method that changes scene to Main page
+ * @param mouseEvent
+ * @throws IOException
+ */
+ public void switchToMain(MouseEvent mouseEvent) throws IOException {
+ App.setRoot("main");
+ }
+
+ /**
+ * Method that changes scene to Search page. It reads the value of the search
+ * field and if not empty it is passed to dataexchange
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToSearch(ActionEvent actionEvent) throws IOException {
+ if (!tbar_search.getText().isEmpty()){
+ App.ex.setSearchField(tbar_search.getText());
+ }
+ App.setRoot("search");
+ }
+
+ /**
+ * Method that changes scene to Explore page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToExplore(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore");
+ }
+
+ /**
+ * Method that changes scene to Albums page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToAlbums(ActionEvent actionEvent) throws IOException {
+ App.setRoot("explore_albums");
+ }
+
+ /**
+ * Method that changes scene to Map page
+ * @param actionEvent
+ * @throws IOException
+ */
+ public void switchToMap(ActionEvent actionEvent) throws IOException {
+ App.setRoot("map");
+ }
+
+ /**
+ * Method that changes scene to Upload page
+ * @param actionEvent the mouse has done something
+ * @throws IOException this page does not exist
+ */
+ public void switchToUpload(ActionEvent actionEvent) throws IOException {
+ App.setRoot("upload");
+ }
+
+ /**
+ * Method that opens large version of image in popup
+ * @param mouseEvent
+ */
+ public void openPopUpPicture(MouseEvent mouseEvent) {
+ //method that opens pop-up of picture
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/database/EntityManagerConfig.java b/src/main/java/NTNU/IDATT1002/database/EntityManagerConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..22d6059a579179ba1945809e05bb7c9fab33a5cc
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/database/EntityManagerConfig.java
@@ -0,0 +1,97 @@
+package NTNU.IDATT1002.database;
+
+import org.hibernate.cfg.Environment;
+
+import javax.persistence.*;
+import java.util.*;
+
+
+/**
+ * Entity Manager Configuration Singleton for overriding hibernate persistence properties.
+ * Provides a single global access point to the applications entity manager.
+ */
+public class EntityManagerConfig {
+
+ private static EntityManager entityManager;
+ private static Map<String, Object> configOverrides = new HashMap<>();
+ private static Properties properties = Environment.getProperties();
+
+
+ private EntityManagerConfig() {
+ }
+
+ /**
+ * Retrieve the entity manager instance.
+ * An entity manager is not created until it is requested.
+ *
+ * @return an entity manager instance
+ */
+ public static EntityManager getEntityManager() {
+ if (entityManager == null)
+ configureEntityManager();
+
+ return entityManager;
+ }
+
+ /**
+ * Parse properties and create the entity manager
+ */
+ private static void configureEntityManager() {
+ if (shouldOverrideConfig())
+ parseConfigProperties();
+
+ createEntityManager();
+ }
+
+ private static boolean shouldOverrideConfig() {
+ return Boolean.parseBoolean((String) properties.get("OVERRIDE_DEFAULT_DB_CONFIG"));
+ }
+
+ /**
+ * Parse properties from resources/hibernate.properties and overrides found values.
+ */
+ private static void parseConfigProperties() {
+ Set<Object> envKeys = properties.keySet();
+
+ for (Object key : envKeys)
+ parseProperty(key);
+ }
+
+ /**
+ * Parse desired values from given key in properties and add them to the configuration overrides.
+ *
+ * @param key the key to parse
+ */
+ private static void parseProperty(Object key) {
+ switch ((String) key) {
+ case "DB_DRIVER":
+ configOverrides.put("javax.persistence.jdbc.driver", properties.get(key));
+ break;
+ case "DB_URL":
+ configOverrides.put("javax.persistence.jdbc.url", properties.get(key));
+ break;
+ case "DB_USER":
+ configOverrides.put("javax.persistence.jdbc.user", properties.get(key));
+ break;
+ case "DB_PASSWORD":
+ configOverrides.put("javax.persistence.jdbc.password", properties.get(key));
+ break;
+ case "DB_DIALECT":
+ configOverrides.put("hibernate.dialect", properties.get(key));
+ break;
+ case "DB_HBM2DDL":
+ configOverrides.put("hibernate.hbm2ddl.auto", properties.get(key));
+ break;
+ default:
+ break;
+ }
+ }
+
+ /**
+ * Create an entity manager with configurations overrides.
+ */
+ private static void createEntityManager() {
+ EntityManagerFactory emf = Persistence.createEntityManagerFactory("ImageApplication", configOverrides);
+ entityManager = emf.createEntityManager();
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/database/LoadDatabase.java b/src/main/java/NTNU/IDATT1002/database/LoadDatabase.java
new file mode 100644
index 0000000000000000000000000000000000000000..4710eff43d08e72b0992e364dffb9b4f16106786
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/database/LoadDatabase.java
@@ -0,0 +1,273 @@
+package NTNU.IDATT1002.database;
+
+import NTNU.IDATT1002.models.Image;
+import NTNU.IDATT1002.models.Tag;
+import NTNU.IDATT1002.models.User;
+import NTNU.IDATT1002.service.AlbumService;
+import NTNU.IDATT1002.service.ImageService;
+import NTNU.IDATT1002.service.UserService;
+
+import javax.persistence.EntityManager;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+
+
+/**
+ * Loads test data into the database.
+ */
+public class LoadDatabase {
+
+ private static UserService userService;
+ private static AlbumService albumService;
+ private static ImageService imageService;
+
+ static {
+ EntityManager entityManager = EntityManagerConfig.getEntityManager();
+
+ userService = new UserService(entityManager);
+ albumService = new AlbumService(entityManager);
+ imageService = new ImageService(entityManager);
+ }
+
+ public static void load() {
+
+ User user = userService.createUser("LarseKaren@mail.com",
+ "LarseKaren",
+ "Larse",
+ "Karen",
+ "+47",
+ "00000000",
+ new Date(),
+ "123")
+ .get();
+ ArrayList<Tag> tags = new ArrayList<>(Arrays.asList(
+ new Tag("#winter"),
+ new Tag("#nature"),
+ new Tag("#mountains")
+ ));
+ Image image = imageService.createImage(user,
+ new File("t14-test-images/1.jpg"),
+ tags).get();
+ albumService.createAlbum("First",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
+ user,
+ Arrays.asList(new Tag("#winter"),
+ new Tag("#nature"),
+ new Tag("#mountains")),
+ Arrays.asList(image));
+
+
+
+ tags = new ArrayList<>(Arrays.asList(
+ new Tag("#winter"),
+ new Tag("#nature"),
+ new Tag("#ice")
+ ));
+ image = imageService.createImage(user,
+ new File("t14-test-images/7.jpg"),
+ tags).get();
+ albumService.createAlbum("Seventh",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
+ user,
+ Arrays.asList(new Tag("#winter"),
+ new Tag("#nature"),
+ new Tag("#ice")),
+ Arrays.asList(image));
+
+
+
+ tags = new ArrayList<>(Arrays.asList(
+ new Tag("#winter"),
+ new Tag("#nature"),
+ new Tag("#water")
+ ));
+ user = userService.createUser("SteiraGuten@mail.com",
+ "SteiraGuten",
+ "Steira",
+ "Guten",
+ "+47",
+ "00000000",
+ new Date(),
+ "123")
+ .get();
+ image = imageService.createImage(user,
+ new File("t14-test-images/2.jpg"),
+ tags).get();
+ albumService.createAlbum("Second",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
+ user,
+ Arrays.asList(new Tag("#mountains"),
+ new Tag("#water"),
+ new Tag("#nature")),
+ Arrays.asList(image));
+
+
+ tags = new ArrayList<>(Arrays.asList(
+ new Tag("#fjords"),
+ new Tag("#nature"),
+ new Tag("#mountains")
+ ));
+ image = imageService.createImage(user,
+ new File("t14-test-images/10.jpg"),
+ tags).get();
+ albumService.createAlbum("Tenth",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
+ user,
+ Arrays.asList(new Tag("#fjords"),
+ new Tag("#nature"),
+ new Tag("#mountains")),
+ Arrays.asList(image));
+
+
+
+ user = userService.createUser("MogenBogen@mail.com",
+ "MogenBogen",
+ "Mogen",
+ "Bogen",
+ "+47",
+ "00000000",
+ new Date(),
+ "123")
+ .get();
+ tags = new ArrayList<>(Arrays.asList(
+ new Tag("#mountains"),
+ new Tag("#nature"),
+ new Tag("#water")
+ ));
+ image = imageService.createImage(user,
+ new File("t14-test-images/3.jpg"),
+ tags).get();
+ albumService.createAlbum("Third",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
+ user,
+ Arrays.asList(new Tag("#mountains"),
+ new Tag("#water"),
+ new Tag("#nature")),
+ Arrays.asList(image));
+
+
+
+ tags = new ArrayList<>(Arrays.asList(
+ new Tag("#art"),
+ new Tag("#nature"),
+ new Tag("#river")
+ ));
+ image = imageService.createImage(user,
+ new File("t14-test-images/9.jpg"),
+ tags).get();
+ albumService.createAlbum("Ninth",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
+ user,
+ Arrays.asList(new Tag("#art"),
+ new Tag("#nature"),
+ new Tag("#river")),
+ Arrays.asList(image));
+
+
+
+
+ user = userService.createUser("Nicolaysen@mail.com",
+ "Nicolaysen",
+ "Nicolai",
+ "Sen",
+ "+47",
+ "00000000",
+ new Date(),
+ "123")
+ .get();
+ tags = new ArrayList<>(Arrays.asList(
+ new Tag("#mountains"),
+ new Tag("#nature"),
+ new Tag("#grass")
+ ));
+ image = imageService.createImage(user,
+ new File("t14-test-images/4.jpg"),
+ tags).get();
+
+ albumService.createAlbum("Fourth",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
+ user,
+ Arrays.asList(new Tag("#mountains"),
+ new Tag("#grass"),
+ new Tag("#nature")),
+ Arrays.asList(image));
+
+
+
+ tags = new ArrayList<>(Arrays.asList(
+ new Tag("#mountains"),
+ new Tag("#dock"),
+ new Tag("#water")
+ ));
+ image = imageService.createImage(user,
+ new File("t14-test-images/5.jpg"),
+ tags).get();
+ albumService.createAlbum("Fifth",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
+ user,
+ Arrays.asList(new Tag("#mountains"),
+ new Tag("#water"),
+ new Tag("#dock")),
+ Arrays.asList(image));
+
+
+
+
+ user = userService.createUser("MaseMads@mail.com",
+ "MaseMads",
+ "Mase",
+ "Mads",
+ "+47",
+ "00000000",
+ new Date(),
+ "123")
+ .get();
+ tags = new ArrayList<>(Arrays.asList(
+ new Tag("#mountains"),
+ new Tag("#nature"),
+ new Tag("#waterfall")
+ ));
+ image = imageService.createImage(user,
+ new File("t14-test-images/6.jpg"),
+ tags).get();
+ albumService.createAlbum("Sixth",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
+ user,
+ Arrays.asList(new Tag("#mountains"),
+ new Tag("#waterfall"),
+ new Tag("#nature")),
+ Arrays.asList(image));
+
+
+
+
+ user = userService.createUser("JensenMannen@mail.com",
+ "JensenMannen",
+ "Jense",
+ "Mannen",
+ "+47",
+ "00000000",
+ new Date(),
+ "123")
+ .get();
+ tags = new ArrayList<>(Arrays.asList(
+ new Tag("#winter"),
+ new Tag("#nature"),
+ new Tag("#mountains")
+ ));
+ image = imageService.createImage(user,
+ new File("t14-test-images/8.jpg"),
+ tags).get();
+ albumService.createAlbum("Eighth",
+ "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ",
+ user,
+ Arrays.asList(new Tag("#winter"),
+ new Tag("#nature"),
+ new Tag("#mountains")),
+ Arrays.asList(image));
+
+
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/filters/AlbumFilter.java b/src/main/java/NTNU/IDATT1002/filters/AlbumFilter.java
new file mode 100644
index 0000000000000000000000000000000000000000..fc98256744eb144f1b718bffb515903bb614fe71
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/filters/AlbumFilter.java
@@ -0,0 +1,59 @@
+package NTNU.IDATT1002.filters;
+
+import NTNU.IDATT1002.models.Album;
+
+import java.util.function.Predicate;
+
+
+/**
+ * Album Filter. Class to filter an album by title, description and tag names.
+ *
+ * @author Eirik Steira
+ * @version 1.0 22.03.20
+ */
+public class AlbumFilter {
+
+ /**
+ * Chain the predicates and test the album by the given query.
+ *
+ * @param query the query to filter by
+ * @return predicate chaining the album filter components.
+ */
+ public static Predicate<Album> filter(String query) {
+ return filterByTitle(query)
+ .or(filterByDescription(query))
+ .or(filterByTags(query));
+ }
+
+ /**
+ * Filter an album by given title.
+ *
+ * @param title the title to query by
+ * @return predicate to apply.
+ */
+ private static Predicate<Album> filterByTitle(String title) {
+ return album -> album.getTitle().contains(title);
+ }
+
+ /**
+ * Filter an album by given description.
+ *
+ * @param description the description to query by
+ * @return predicate to apply.
+ */
+ private static Predicate<Album> filterByDescription(String description) {
+ return album -> album.getTitle().contains(description);
+ }
+
+ /**
+ * Filter an album by given tag name.
+ *
+ * @param tagName the tag name to query by
+ * @return predicate to apply.
+ */
+ private static Predicate<Album> filterByTags(String tagName) {
+ return album -> album.getTags().stream()
+ .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
+ }
+
+}
diff --git a/src/main/java/NTNU/IDATT1002/filters/ImageFilter.java b/src/main/java/NTNU/IDATT1002/filters/ImageFilter.java
new file mode 100644
index 0000000000000000000000000000000000000000..afb780140478ad4d724fc15c50ca1036e86396d5
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/filters/ImageFilter.java
@@ -0,0 +1,40 @@
+package NTNU.IDATT1002.filters;
+
+
+import NTNU.IDATT1002.models.Image;
+
+import java.util.function.Predicate;
+
+
+/**
+ * Album Filter. Class to filter an album by title, description and tag names.
+ *
+ * @author Stian Mogen
+ * @version 1.0 22.03.20
+ */
+public class ImageFilter {
+
+ /**
+ * Image filter can filter an album by tags
+ * Uses method filterByTags
+ * @param query the query to filter by
+ * @return predicate chaining the album filter components.
+ */
+
+ public static Predicate<Image> filter(String query) {
+ return filterByTags(query);
+ }
+
+ /**
+ * Filters images based on tag
+ * @param tagName
+ * @return predicate to apply
+ */
+
+
+ private static Predicate<Image> filterByTags(String tagName){
+ return image -> image.getTags().stream()
+ .anyMatch(tag -> tag.getName().equalsIgnoreCase(tagName));
+ }
+
+}
diff --git a/src/main/java/NTNU/IDATT1002/models/ImageAlbum.java b/src/main/java/NTNU/IDATT1002/models/Album.java
similarity index 53%
rename from src/main/java/NTNU/IDATT1002/models/ImageAlbum.java
rename to src/main/java/NTNU/IDATT1002/models/Album.java
index 9d650c3af6f6fa2501eb84e4d8d306262406de3d..e6b1be1568e169b25b85f7548b76270d0d039e2e 100644
--- a/src/main/java/NTNU/IDATT1002/models/ImageAlbum.java
+++ b/src/main/java/NTNU/IDATT1002/models/Album.java
@@ -12,32 +12,35 @@ import java.util.Objects;
/**
- * Class ImageAlbum representing an image album. Contains {@link Image}s and the creator ({@link User})
+ * Class Album representing an album. Contains {@link Image}s and the creator ({@link User})
*
* @author Eirik Steira
* @version 1.1 19.03.20
* */
@Entity
-@Table(name = "image_album")
+@Table(name = "album")
@NamedQueries({
- @NamedQuery(name = "ImageAlbum.findAllByTitle",
- query="SELECT ia from ImageAlbum ia WHERE ia.title LIKE :queried_title ")
+ @NamedQuery(name="Album.findAllByUsername",
+ query = "SELECT ia from Album ia WHERE ia.user.username = :username")
})
-public class ImageAlbum {
+public class Album {
@Id
- @GeneratedValue(strategy = GenerationType.AUTO)
+ @GeneratedValue
private Long id;
@NotBlank(message = "Title may not be blank")
private String title;
- @ManyToOne
+ @ManyToOne(fetch = FetchType.LAZY)
private User user;
- @ManyToMany
+ @ManyToMany(fetch = FetchType.LAZY)
private List<Image> images = new ArrayList<>();;
+ @ManyToMany(fetch = FetchType.LAZY)
+ private List<Tag> tags = new ArrayList<>();;
+
private String description;
@CreationTimestamp
@@ -46,7 +49,7 @@ public class ImageAlbum {
@UpdateTimestamp
private Date updatedAt;
- public ImageAlbum() {
+ public Album() {
}
public void setId(Long id) {
@@ -57,21 +60,66 @@ public class ImageAlbum {
return id;
}
+ public String getTitle() {
+ return title;
+ }
+
+ public User getUser() {
+ return user;
+ }
+
+ public List<Image> getImages() {
+ return images;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public Date getCreatedAt() {
+ return createdAt;
+ }
+
+ public Date getUpdatedAt() {
+ return updatedAt;
+ }
+
+ public List<Tag> getTags() {
+ return tags;
+ }
+
public void setTitle(String title) {
this.title = title;
}
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
public void setUser(User user) {
this.user = user;
}
+ public void setTags(List<Tag> tags) {
+ this.tags = tags;
+ }
+
+ public void setImages(List<Image> images) {
+ this.images = images;
+ }
+
+ public void setCreatedAt(Date createdAt) {
+ this.createdAt = createdAt;
+ }
+
/**
- * Add given image to the album.
+ * Add given image to this album.
*
* @param image the image to add
*/
public void addImage(Image image) {
-
+ image.addAlbum(this);
+ images.add(image);
}
/**
@@ -80,7 +128,26 @@ public class ImageAlbum {
* @param image the image to add
*/
public void removeImage(Image image) {
+ image.removeAlbum(this);
+ images.remove(image);
+ }
+ /**
+ * Add given tag to this album
+ *
+ * @param tag the tag to add
+ */
+ public void addTag(Tag tag) {
+ tags.add(tag);
+ }
+
+ /**
+ * Remove given tag to this album
+ *
+ * @param tag the tag to add
+ */
+ public void removeTag(Tag tag) {
+ tags.remove(tag);
}
/**
@@ -94,7 +161,7 @@ public class ImageAlbum {
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
- ImageAlbum that = (ImageAlbum) o;
+ Album that = (Album) o;
return id.equals(that.id) &&
title.equals(that.title) &&
user.equals(that.user) &&
diff --git a/src/main/java/NTNU/IDATT1002/models/GeoLocation.java b/src/main/java/NTNU/IDATT1002/models/GeoLocation.java
new file mode 100644
index 0000000000000000000000000000000000000000..b5404e32ba77710c6ac413cd3b754783edacfb1c
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/models/GeoLocation.java
@@ -0,0 +1,76 @@
+package NTNU.IDATT1002.models;
+
+
+import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Creates table Geolocation
+ */
+
+@Entity
+@Table(name = "geolocation")
+public class GeoLocation {
+
+ /**
+ * Defines geolocationId, this may not be blank
+ */
+ @Id
+ @GeneratedValue
+ private Long geoLocationId;
+
+ /**
+ * One to one relation between geolocationId in table Geolocation
+ * Joins column geolocation_id in metadata
+ */
+ @OneToOne(mappedBy = "geolocation", fetch = FetchType.LAZY)
+ private Metadata metadata;
+
+ @NotBlank (message = "Altitude may not be blank")
+ private String latitude;
+
+ @NotBlank (message = "Longitude may not be blank")
+ private String longitude;
+
+ public GeoLocation() {
+
+ }
+ /**
+ * Creates constructor for geolocation that takes in each parameter
+ *
+ * @param latitude
+ * @param longitude
+ */
+ public GeoLocation(String latitude, String longitude){
+ this.latitude = latitude;
+ this.longitude = longitude;
+ }
+
+ public Long getGeoLocationId() {
+ return geoLocationId;
+ }
+
+ public String getLatitude() {
+ return latitude;
+ }
+
+ public String getLongitude() {
+ return longitude;
+ }
+
+ public void setGeoLocationId(Long geoLocationId) {
+ this.geoLocationId = geoLocationId;
+ }
+
+ public void setLatitude(String altitude) {
+ this.latitude = altitude;
+ }
+
+ public void setLongitude(String longitude) {
+ this.longitude = longitude;
+ }
+
+ public void setMetadata(Metadata metadata) {
+ this.metadata = metadata;
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/models/Histogram.java b/src/main/java/NTNU/IDATT1002/models/Histogram.java
new file mode 100644
index 0000000000000000000000000000000000000000..770a6aa48f8bc9a533f927893b2ba10d8f5eac22
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/models/Histogram.java
@@ -0,0 +1,55 @@
+package NTNU.IDATT1002.models;
+
+
+import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * Creates histogram table
+ */
+
+@Entity
+@Table(name = "histogram")
+public class Histogram {
+
+ /**
+ * Defines id, may not be blank
+ */
+ @Id
+ @GeneratedValue
+ private Long histogramId;
+
+ /**
+ * One to one relations, joins histogramId
+ * On columns histogramId in metadata
+ */
+ @OneToOne(mappedBy = "histogram", fetch = FetchType.LAZY)
+ private Metadata metadata;
+
+ @Lob
+ @NotBlank(message = "Data may not be blank")
+ private String data;
+
+ public Histogram() {
+ }
+
+ public Long getHistogramId() {
+ return histogramId;
+ }
+
+ public String getData() {
+ return data;
+ }
+
+ public void setHistogramId(Long histogramId) {
+ this.histogramId = histogramId;
+ }
+
+ public void setData(String data) {
+ this.data = data;
+ }
+
+ public void setMetadata(Metadata metadata) {
+ this.metadata = metadata;
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/models/Image.java b/src/main/java/NTNU/IDATT1002/models/Image.java
index bd29936ec2ccce6f878e75377d7223e3fc57e49a..f01bf81aa96d1d03ea7f2861ada676e1419e97e2 100644
--- a/src/main/java/NTNU/IDATT1002/models/Image.java
+++ b/src/main/java/NTNU/IDATT1002/models/Image.java
@@ -1,102 +1,139 @@
package NTNU.IDATT1002.models;
+import org.hibernate.annotations.CreationTimestamp;
+
import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
import java.util.ArrayList;
-import java.util.List;
-
import java.util.Date;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.validation.constraints.NotBlank;
-import org.hibernate.annotations.CreationTimestamp;
+import java.util.List;
@Entity
@Table(name = "image")
-public class Image {
-
+@NamedQueries({
+ @NamedQuery(name="Image.findAllByUsername",
+ query = "SELECT ia from Image ia WHERE ia.user.username = :username")
+})
+public class Image {
@Id
- @GeneratedValue(strategy = GenerationType.AUTO)
+ @GeneratedValue
private Long id;
- @ManyToMany
- private List<ImageAlbum> imageAlbums = new ArrayList<>();;
+ @ManyToMany(fetch = FetchType.LAZY)
+ private List<Album> albums = new ArrayList<>();
+ @ManyToMany(fetch = FetchType.LAZY)
+ private List<Tag> tags = new ArrayList<>();
- @NotBlank
- private Long imageID;
+ @ManyToOne(fetch = FetchType.LAZY)
+ private User user;
- @NotBlank
- private Long albumID;
+ @Lob
+ @NotNull
+ @NotEmpty
+ private byte[] rawImage;
- @NotBlank
- private Long metaDataID;
-
- @NotBlank
- @CreationTimestamp
- private Date uploadAt;
+ @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ private Metadata metadata;
@NotBlank
private String path;
+ @CreationTimestamp
+ private Date uploadedAt;
+
public Image() {
}
- public Image(Long imageID, Long albumID, Long metaDataId, Date uploadAt, String path) {
- this.imageID = imageID;
- this.albumID = albumID;
- this.metaDataID = metaDataId;
- this.uploadAt = uploadAt;
+ public Image(byte[] rawImage, Album album, User user, Metadata metadata, String path) {
+ this.rawImage = rawImage;
+ this.addAlbum(album);
+ this.user = user;
+ this.metadata = metadata;
this.path = path;
+ this.tags = new ArrayList<>();
}
- public Image(Image image) {
- this(image.getImageID(), image.getAlbumID(), image.getMetaDataID(), image.getUploadAt(), image.getPath());
+ public Long getId() {
+ return id;
}
- public void setImageID(Long imageID) {
- this.imageID = imageID;
+ public void setId(Long id) {
+ this.id = id;
}
- public void setAlbumID(Long albumID) {
- this.albumID = albumID;
+ public byte[] getRawImage() {
+ return rawImage;
}
- public void setMetaDataID(Long metaDataID) {
- this.metaDataID = metaDataID;
+ public void setRawImage(byte[] rawImage) {
+ this.rawImage = rawImage;
}
- public void setUploadAt(Date uploadAt) {
- this.uploadAt = uploadAt;
+ public void setUser(User user) {
+ this.user = user;
+ }
+
+ public void setMetadata(Metadata metadata) {
+ this.metadata = metadata;
}
public void setPath(String path) {
this.path = path;
}
- public Long getImageID() {
- return imageID;
+ public List<Album> getAlbums() {
+ return albums;
+ }
+
+ public void addTags(ArrayList<Tag> tags) {
+ tags.addAll(tags);
}
- public Long getAlbumID() {
- return albumID;
+ public void addTag(Tag tag){
+ tags.add(tag);
}
- public Long getMetaDataID() {
- return metaDataID;
+ public List<Tag> getTags() {
+ return tags;
+ }
+
+ public Metadata getMetadata() {
+ return metadata;
}
- public Date getUploadAt() {
- return uploadAt;
+ public Date getUploadedAt() {
+ return uploadedAt;
}
public String getPath() {
return path;
}
+
+ /**
+ * Add this image in the given album.
+ *
+ * @param album the album to add to
+ */
+ public void addAlbum(Album album) {
+ albums.add(album);
+ }
+
+ /**
+ * Remove this image from the given image.
+ *
+ * @param album the album to remove from
+ */
+ public void removeAlbum(Album album) {
+ albums.remove(album);
+ }
+
@Override
public boolean equals(Object o) {
if (this == o) {
@@ -106,10 +143,9 @@ public class Image {
return false;
}
Image that = (Image) o;
- return getImageID() == that.getImageID() &&
- getAlbumID() == that.getAlbumID();
+ return getId().equals(that.getId());
}
-}
+}
diff --git a/src/main/java/NTNU/IDATT1002/models/Login.java b/src/main/java/NTNU/IDATT1002/models/Login.java
new file mode 100644
index 0000000000000000000000000000000000000000..d05d0c872d91d1c146a0e5a29596eb754a366e4a
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/models/Login.java
@@ -0,0 +1,63 @@
+package NTNU.IDATT1002.models;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
+
+@Entity
+@Table(name = "login")
+public class Login {
+
+
+ @Id
+ @JoinColumn(name = "username")
+ private String username;
+
+
+ @OneToOne(cascade = {CascadeType.ALL}, fetch = FetchType.LAZY)
+ private User user;
+
+ @NotBlank(message = "Hash salt may not be blank")
+ private String hash;
+
+ @NotBlank(message = "Password salt may not be blank")
+ private String passwordSalt;
+
+ public Login() {
+ }
+
+ public Login(User user) {
+ this.username = user.getUsername();
+ this.user = user;
+ }
+
+ public Login(User user, String passwordSalt , String hash) {
+ this.username = user.getUsername();
+ this.user = user;
+ this.hash = hash;
+ this.passwordSalt = passwordSalt;
+ }
+
+ public User getUser() {
+ return user;
+ }
+
+ public void setUser(User user) {
+ this.user = user;
+ }
+
+ public void setHash(String hash) {
+ this.hash = hash;
+ }
+
+ public void setPasswordSalt(String passwordSalt) {
+ this.passwordSalt = passwordSalt;
+ }
+
+ public String getHash() {
+ return hash;
+ }
+
+ public String getPasswordSalt() {
+ return passwordSalt;
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/models/Metadata.java b/src/main/java/NTNU/IDATT1002/models/Metadata.java
new file mode 100644
index 0000000000000000000000000000000000000000..b28d6e58c50d4d96c71e8e8cbcb87e8a7c69d967
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/models/Metadata.java
@@ -0,0 +1,70 @@
+package NTNU.IDATT1002.models;
+
+
+import javax.persistence.*;
+
+/**
+ * Creates Metadata table
+ */
+
+@Entity
+@Table(name = "metadata")
+public class Metadata {
+
+ /**
+ * Defines metadataId, may not be blank
+ */
+ @Id
+ @GeneratedValue
+ private Long metadataId;
+
+ /**
+ * One to one relation joining imageId
+ * on image_id column in image
+ */
+ @OneToOne(mappedBy = "metadata", fetch = FetchType.LAZY)
+ private Image image;
+
+ @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ private GeoLocation geolocation;
+
+ @OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+ private Histogram histogram;
+
+ public Metadata() {
+ }
+
+ public Metadata(Image image, GeoLocation geoLocation, Histogram histogram) {
+ this.image = image;
+ this.geolocation = geolocation;
+ this.histogram = histogram;
+ }
+
+ public Long getMetadataId() {
+ return metadataId;
+ }
+
+ public Image getImage() {
+ return image;
+ }
+
+ public GeoLocation getGeoLocation() {
+ return geolocation;
+ }
+
+ public Histogram getHistogram() {
+ return histogram;
+ }
+
+ public void setImage(Image image) {
+ this.image = image;
+ }
+
+ public void setGeoLocation(GeoLocation geolocation) {
+ this.geolocation = geolocation;
+ }
+
+ public void setHistogram(Histogram histogram) {
+ this.histogram = histogram;
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/models/Tag.java b/src/main/java/NTNU/IDATT1002/models/Tag.java
new file mode 100644
index 0000000000000000000000000000000000000000..cf0914529deb8844c820d2681b5d74deb115ae92
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/models/Tag.java
@@ -0,0 +1,116 @@
+package NTNU.IDATT1002.models;
+
+
+
+import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * Tag model
+ * @author Stian Mogen
+ */
+
+/**
+ * Creates table named tag
+ */
+
+@Entity
+@Table(name = "tag")
+public class Tag {
+
+ /**
+ * Defines the tag-id, this cannot be blank
+ */
+ @Id
+ @GeneratedValue
+ private Long tagId;
+
+
+ /**
+ * Creates a many to many relations between tag and image
+ * on table ImageTags, joining column tagId and imageId
+ */
+ @ManyToMany(cascade = {CascadeType.ALL}, fetch = FetchType.LAZY)
+ @JoinTable(
+ name = "image_tag",
+ joinColumns = {@JoinColumn(name = "tag_id")},
+ inverseJoinColumns = {@JoinColumn(name = "image_id")}
+ )
+ Set<Image> image = new HashSet<>();
+
+ /**
+ * Creates a many to many relations between tag and album
+ */
+ @ManyToMany(cascade = {CascadeType.ALL}, fetch = FetchType.LAZY)
+ @JoinTable(
+ name = "album_tags",
+ joinColumns = {@JoinColumn(name = "tag_id")},
+ inverseJoinColumns = {@JoinColumn(name = "album_id")}
+ )
+ Set<Image> albums = new HashSet<>();
+
+ @NotBlank(message = "Tag name may not be blank")
+ private String name;
+
+ public Tag() {
+ }
+
+ /**
+ * Contructor to set initial tag name.
+ *
+ * @param name the name of the tag
+ */
+ public Tag(String name) {
+ this.name = name;
+ }
+
+ /**
+ * Constructor with tagId and name as parameters
+ *
+ * @param tagId
+ * @param name
+ */
+ public Tag(Long tagId, String name) {
+ this.tagId = tagId;
+ this.name = name;
+ }
+
+ /**
+ * Constructor thar takes in a tag object
+ *
+ * @param tag
+ */
+ public Tag(Tag tag) {
+ this(tag.getTagId(),
+ tag.getName());
+ }
+
+ public Long getTagId() {
+ return tagId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setTagId(Long tagId) {
+ this.tagId = tagId;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ Tag tag = (Tag) o;
+ return Objects.equals(tagId, tag.tagId) &&
+ Objects.equals(name, tag.name);
+ }
+
+}
diff --git a/src/main/java/NTNU/IDATT1002/models/User.java b/src/main/java/NTNU/IDATT1002/models/User.java
index bcd11e8535e9118139d6571c1f7363da9c92de7e..77c5f914f2d8aff2dcbb9f486a97ac52c235b089 100644
--- a/src/main/java/NTNU/IDATT1002/models/User.java
+++ b/src/main/java/NTNU/IDATT1002/models/User.java
@@ -1,7 +1,11 @@
package NTNU.IDATT1002.models;
import javax.persistence.*;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Past;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
@Entity
@@ -11,31 +15,168 @@ public class User {
@Id
private String username;
+ @Email
+ @NotBlank(message = "Email may not be blank")
+ private String email;
+
+ @NotBlank(message = "Fist name may not be blank")
+ private String firstName;
+
+ @NotBlank(message = "Last name may not be blank")
+ private String lastName;
+
+ @NotBlank(message = "Calling code may not be blank")
+ private String callingCode;
+
+ @NotBlank(message = "Phone number may not be blank")
+ private String phoneNumber;
+
+ @Past(message = "Birth date must be in the past")
+ private Date birthDate;
+
+ private boolean isAdmin;
+ private boolean isActive;
+
+
@OneToMany(
mappedBy = "user",
cascade = CascadeType.ALL,
- orphanRemoval = true
+ orphanRemoval = true,
+ fetch = FetchType.LAZY
)
- private List<ImageAlbum> imageAlbums = new ArrayList<>();
+ private List<Album> albums = new ArrayList<>();
+
+ @OneToMany(
+ mappedBy = "user",
+ cascade = CascadeType.ALL,
+ orphanRemoval = true,
+ fetch = FetchType.LAZY
+ )
+ private List<Image> images = new ArrayList<>();
+
+ public User() {
+ }
+
+ public User(String username, String email, String firstName, String lastName, String callingCode, String phoneNumber, Date birthDate) {
+ this.username = username;
+ this.email = email;
+ this.firstName = firstName;
+ this.lastName = lastName;
+ this.callingCode = callingCode;
+ this.phoneNumber = phoneNumber;
+ this.birthDate = birthDate;
+ this.isAdmin = false;
+ this.isActive = true;
+ }
+
+ public String getEmail() {
+ return email;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public String getLastName() {
+ return lastName;
+ }
+
+ public String getCallingCode() {
+ return callingCode;
+ }
+
+ public String getPhoneNumber() {
+ return phoneNumber;
+ }
+
+ public Date getBirthDate() {
+ return birthDate;
+ }
+
+ public boolean isAdmin() {
+ return isAdmin;
+ }
+
+ public boolean isActive() {
+ return isActive;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public void setEmail(String email) {
+ this.email = email;
+ }
+
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
+
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+
+ public void setCallingCode(String callingCode) {
+ this.callingCode = callingCode;
+ }
+
+ public void setPhoneNumber(String phoneNumber) {
+ this.phoneNumber = phoneNumber;
+ }
+
+ public void setBirthDate(Date birthDate) {
+ this.birthDate = birthDate;
+ }
+ /**
+ * Add given album.
+ *
+ * @param album the album to add
+ */
+ public void addAlbum(Album album) {
+ albums.add(album);
+ album.setUser(this);
+ }
/**
- * Add given image album.
+ * Remove given album.
*
- * @param imageAlbum the image album to add
+ * @param album the album to remove
*/
- public void addImageAlbum(ImageAlbum imageAlbum) {
- imageAlbums.add(imageAlbum);
- imageAlbum.setUser(this);
+ public void removeAlbum(Album album) {
+ albums.remove(album);
+ album.setUser(null);
}
/**
- * Remove given image album.
+ * Add given image.
*
- * @param imageAlbum the image album to remove
+ * @param image the image to add
*/
- public void removeImageAlbum(ImageAlbum imageAlbum) {
- imageAlbums.remove(imageAlbum);
- imageAlbum.setUser(null);
+ public void addImage(Image image) {
+ images.add(image);
+ image.setUser(this);
}
+ /**
+ * Remove given image.
+ *
+ * @param image the image to remove
+ */
+ public void removeAlbum(Image image) {
+ images.remove(image);
+ image.setUser(null);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ User user = (User) o;
+ return username.equals(user.username);
+ }
}
diff --git a/src/main/java/NTNU/IDATT1002/repository/AlbumRepository.java b/src/main/java/NTNU/IDATT1002/repository/AlbumRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..1582baca2dcc5c3c77b867db4a59bd7006328771
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/repository/AlbumRepository.java
@@ -0,0 +1,45 @@
+package NTNU.IDATT1002.repository;
+
+import NTNU.IDATT1002.models.Album;
+
+import javax.persistence.EntityManager;
+import java.util.List;
+
+/**
+ * Album Repository.
+ *
+ * Implementation of {@link GenericRepository} which supports regular Create, Read, Update and Delete operations.
+ * @author Eirik Steira
+ * @version 1.0 19.03.20
+ * @see NTNU.IDATT1002.repository.GenericRepository
+ */
+public class AlbumRepository extends GenericRepository<Album, Long> {
+
+ /**
+ * Mapping to @NamedQuery 'find all albums by users username' defined in {@link Album}
+ */
+ public static final String ALBUM_FIND_BY_USERNAME = "Album.findAllByUsername";
+
+ /**
+ * Constructor to inject {@link EntityManager} dependency and sets the class type to {@link Album}
+ *
+ * @param entityManager the entity manager to utilize
+ */
+ public AlbumRepository(EntityManager entityManager) {
+ super(entityManager);
+ setClassType(Album.class);
+ }
+
+ /**
+ * Retrieves all albums of the user with the given username.
+ *
+ * @param username the username to query for
+ * @return the list of the users albums.
+ */
+ public List<Album> findAllByUsername(String username) {
+ return entityManager.createNamedQuery(ALBUM_FIND_BY_USERNAME, Album.class)
+ .setParameter("username", username)
+ .getResultList();
+ }
+
+}
diff --git a/src/main/java/NTNU/IDATT1002/repository/GenericRepository.java b/src/main/java/NTNU/IDATT1002/repository/GenericRepository.java
index 5e474d2a15dc7c3735e5665105d5dbd0b663ff97..84ac6b4895f098f1ccb1db973ddc32c9d6aca004 100644
--- a/src/main/java/NTNU/IDATT1002/repository/GenericRepository.java
+++ b/src/main/java/NTNU/IDATT1002/repository/GenericRepository.java
@@ -53,7 +53,7 @@ abstract class GenericRepository<T, ID> implements Repository<T, ID> {
public Optional<T> save(T entity) {
try {
persist(entity);
- return Optional.of(entity);
+ return Optional.ofNullable(entity);
} catch (Exception e) {
e.printStackTrace();
}
@@ -62,9 +62,9 @@ abstract class GenericRepository<T, ID> implements Repository<T, ID> {
}
/**
- * Persists the given image album.
+ * Persists the given album.
*
- * @param entity the image album to persist
+ * @param entity the album to persist
*/
private void persist(T entity) {
entityManager.getTransaction().begin();
@@ -77,7 +77,8 @@ abstract class GenericRepository<T, ID> implements Repository<T, ID> {
*
* @return all entities
*/
- public List<?> findAll() {
+ @SuppressWarnings("unchecked")
+ public List<T> findAll() {
return entityManager.createQuery("from " + classType.getName())
.getResultList();
}
@@ -117,9 +118,9 @@ abstract class GenericRepository<T, ID> implements Repository<T, ID> {
}
/**
- * Removes the given image album.
+ * Removes the given album.
*
- * @param entity the image album to remove
+ * @param entity the album to remove
*/
private void remove(T entity) {
entityManager.getTransaction().begin();
diff --git a/src/main/java/NTNU/IDATT1002/repository/GeoLocatioRepository.java b/src/main/java/NTNU/IDATT1002/repository/GeoLocatioRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..f5962b0e60c659a92b6c2bcc0b604671c0ad6cfc
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/repository/GeoLocatioRepository.java
@@ -0,0 +1,18 @@
+package NTNU.IDATT1002.repository;
+
+import NTNU.IDATT1002.models.GeoLocation;
+
+import javax.persistence.EntityManager;
+
+public class GeoLocatioRepository extends GenericRepository<GeoLocation, Long> {
+
+ /**
+ * Constructor to inject {@link EntityManager} dependency.
+ *
+ * @param entityManager the entity manager to utilize
+ */
+ public GeoLocatioRepository(EntityManager entityManager) {
+ super(entityManager);
+ setClassType(GeoLocation.class);
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/repository/HistorgramRepository.java b/src/main/java/NTNU/IDATT1002/repository/HistorgramRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..97c009d94a4920f2466a0ac8a6c7803d9fa76dae
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/repository/HistorgramRepository.java
@@ -0,0 +1,18 @@
+package NTNU.IDATT1002.repository;
+
+import NTNU.IDATT1002.models.Histogram;
+
+import javax.persistence.EntityManager;
+
+public class HistorgramRepository extends GenericRepository<Histogram, Long> {
+
+ /**
+ * Constructor to inject {@link EntityManager} dependency.
+ *
+ * @param entityManager the entity manager to utilize
+ */
+ public HistorgramRepository(EntityManager entityManager) {
+ super(entityManager);
+ setClassType(Histogram.class);
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/repository/ImageAlbumRepository.java b/src/main/java/NTNU/IDATT1002/repository/ImageAlbumRepository.java
deleted file mode 100644
index fa5706cfbbd29ff2f151e4b1817a7e3409b30545..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/repository/ImageAlbumRepository.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package NTNU.IDATT1002.repository;
-
-import NTNU.IDATT1002.models.ImageAlbum;
-
-import javax.persistence.EntityManager;
-import java.util.List;
-
-/**
- * Image Album Repository.
- *
- * Implementation of {@link GenericRepository} which supports regular Create, Read, Update and Delete operations.
- * @author Eirik Steira
- * @version 1.0 19.03.20
- * @see NTNU.IDATT1002.repository.GenericRepository
- */
-public class ImageAlbumRepository extends GenericRepository<ImageAlbum, Long> {
-
- /**
- * Mapping to @NamedQuery 'find all image albums by title' defined in {@link ImageAlbum}
- */
- public static final String IMAGE_ALBUM_FIND_BY_TITLE = "ImageAlbum.findAllByTitle";
-
- /**
- * Constructor to inject {@link EntityManager} dependency and sets the class type to {@link ImageAlbum}
- *
- * @param entityManager the entity manager to utilize
- */
- public ImageAlbumRepository(EntityManager entityManager) {
- super(entityManager);
- setClassType(ImageAlbum.class);
- }
-
- /**
- * Retrieves all image albums with the given title.
- *
- * @param title the image album title
- * @return all image albums with the given title
- */
- public List<?> findAllByTitle(String title) {
- return entityManager.createNamedQuery(IMAGE_ALBUM_FIND_BY_TITLE)
- .setParameter("queried_title", "%" + title + "%")
- .getResultList();
- }
-
-}
diff --git a/src/main/java/NTNU/IDATT1002/repository/ImageRepository.java b/src/main/java/NTNU/IDATT1002/repository/ImageRepository.java
index b2f737184613662ea25f9c80495e3f448ef8028c..d5537a5c053d4a73919212abb72055062b2967d8 100644
--- a/src/main/java/NTNU/IDATT1002/repository/ImageRepository.java
+++ b/src/main/java/NTNU/IDATT1002/repository/ImageRepository.java
@@ -1,7 +1,8 @@
package NTNU.IDATT1002.repository;
import NTNU.IDATT1002.models.Image;
-import java.util.Optional;
+
+
import javax.persistence.EntityManager;
import java.util.List;
@@ -18,37 +19,34 @@ import java.util.List;
public class ImageRepository extends GenericRepository<Image, Long> {
- private EntityManager entityManager;
-
- /**
- * Constructor to inject {@link EntityManager} dependency.
- *
- * @param entityManager the entity manager to utilize
- */
- public ImageRepository(EntityManager entityManager) {
- super(entityManager);
- }
-
-
- /**
- * Retrieves all instances of the type image.
- *
- * @return all entities
- */
- public Optional<Image> update(Image image) {
- return Optional.empty();
- }
+ /**
+ * Mapping to @NamedQuery 'find all albums by users username' defined in {@link Image}
+ */
+ public static final String IMAGE_FIND_BY_USERNAME = "Album.findAllByUsername";
+
+ /**
+ * Constructor to inject {@link EntityManager} dependency.
+ *
+ * @param entityManager the entity manager to utilize
+ */
+ public ImageRepository(EntityManager entityManager) {
+ super(entityManager);
+ setClassType(Image.class);
+ }
+
+ /**
+ * Retrieves all albums of the user with the given username.
+ *
+ * @param username the username to query for
+ * @return the list of the users albums.
+ */
+ public List<Image> findAllByUsername(String username) {
+ return entityManager.createNamedQuery(IMAGE_FIND_BY_USERNAME, Image.class)
+ .setParameter("username", username)
+ .getResultList();
+ }
+}
- /**
- * Return whether the given image exists.
- *
- * @param image image album to check existence for
- * @return true if the image album exist, else false
- */
- public boolean exists(Image image) {
- return findById(image.getImageID()).isPresent();
- }
-}
diff --git a/src/main/java/NTNU/IDATT1002/repository/LoginRepository.java b/src/main/java/NTNU/IDATT1002/repository/LoginRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..ab1a02ee2349621e37997ad536f8a2bf45b301e6
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/repository/LoginRepository.java
@@ -0,0 +1,41 @@
+package NTNU.IDATT1002.repository;
+
+
+import NTNU.IDATT1002.ApplicationState;
+import NTNU.IDATT1002.models.Album;
+import NTNU.IDATT1002.models.Login;
+import NTNU.IDATT1002.models.User;
+import NTNU.IDATT1002.utils.Authentication;
+
+import javax.persistence.EntityManager;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Login Repository
+ *
+ * Implements {@link Repository} whick supports CRUD operations.
+ *
+ * @author madslun
+ * @version 1.0 22.03.20
+ * @see NTNU.IDATT1002.repository.Repository
+ */
+
+public class LoginRepository extends GenericRepository<Login, String>{
+
+ private EntityManager entityManager;
+
+
+ /**
+ * Constructor to inject {@link EntityManager} dependency and sets the class type to {@link Login}
+ *
+ * @param entityManager the entity manager to utilize
+ */
+ public LoginRepository(EntityManager entityManager) {
+ super(entityManager);
+ setClassType(Login.class);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/NTNU/IDATT1002/repository/MetadataRepository.java b/src/main/java/NTNU/IDATT1002/repository/MetadataRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..5884744268194e0ef01246af46a5b6ca9a02b62e
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/repository/MetadataRepository.java
@@ -0,0 +1,43 @@
+package NTNU.IDATT1002.repository;
+
+import NTNU.IDATT1002.models.Metadata;
+
+import javax.persistence.EntityManager;
+import java.util.Optional;
+
+/**
+ * Tag Repository.
+ *
+ * Implementation of {@link GenericRepository} which supports regular Create, Read, Update and Delete operations.
+ * @author Stian Mogen, Eirik Steira
+ * @version 1.0 22.03.20
+ * @see NTNU.IDATT1002.repository.GenericRepository
+ */
+public class MetadataRepository extends GenericRepository<Metadata, Long> {
+
+ /**
+ * Constructor to inject {@link EntityManager} dependency and sets the class type to {@link Metadata}
+ *
+ * @param entityManager the entity manager to utilize
+ */
+ public MetadataRepository(EntityManager entityManager) {
+ super(entityManager);
+ setClassType(Metadata.class);
+ }
+
+ /**
+ * Retrieves a tag if found and creates it if not.
+ *
+ * @param metadata the tag to retrieve
+ * @return the tag if found, else the newly created one.
+ */
+ public Optional<Metadata> findOrCreate(Metadata metadata) {
+ Optional<Metadata> foundMetadata = findById(metadata.getMetadataId());
+
+ if (foundMetadata.isPresent())
+ return foundMetadata;
+
+ return save(metadata);
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/NTNU/IDATT1002/repository/TagRepository.java b/src/main/java/NTNU/IDATT1002/repository/TagRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..ccd0a78a1bca3780eceeed4d2abe1ff2b03498fd
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/repository/TagRepository.java
@@ -0,0 +1,47 @@
+package NTNU.IDATT1002.repository;
+
+import NTNU.IDATT1002.models.Tag;
+
+import javax.persistence.EntityManager;
+import java.util.Optional;
+
+/**
+ * Tag Repository.
+ *
+ * Implementation of {@link GenericRepository} which supports regular Create, Read, Update and Delete operations.
+ * @author Eirik Steira
+ * @version 1.0 21.03.20
+ * @see NTNU.IDATT1002.repository.GenericRepository
+ */
+public class TagRepository extends GenericRepository<Tag, Long> {
+
+ /**
+ * Constructor to inject {@link EntityManager} dependency and sets the class type to {@link Tag}
+ *
+ * @param entityManager the entity manager to utilize
+ */
+ public TagRepository(EntityManager entityManager) {
+ super(entityManager);
+ setClassType(Tag.class);
+ }
+
+ /**
+ * Retrieves a tag if found and creates it if not.
+ *
+ * @param tag the tag to retrieve
+ * @return the tag if found, else the newly created one.
+ */
+ public Optional<Tag> findOrCreate(Tag tag) {
+ try {
+ Optional<Tag> foundTag = findById(tag.getTagId());
+
+ if (foundTag.isPresent())
+ return foundTag;
+ } catch (IllegalArgumentException e) {
+ e.printStackTrace();
+ }
+
+ return save(tag);
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/NTNU/IDATT1002/repository/UserRepository.java b/src/main/java/NTNU/IDATT1002/repository/UserRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..df6fec47dc86308ab47ef2d85d9a217df0c37706
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/repository/UserRepository.java
@@ -0,0 +1,24 @@
+package NTNU.IDATT1002.repository;
+
+import NTNU.IDATT1002.models.User;
+
+import javax.persistence.EntityManager;
+
+/**
+ * User Repository.
+ * Implementation of {@link GenericRepository} which supports regular Create, Read, Update and Delete operations.
+ *
+ * @version 1.0 22.03.20
+ */
+public class UserRepository extends GenericRepository<User, String> {
+
+ /**
+ * Constructor to inject {@link EntityManager} dependency and sets the class type to {@link User}
+ *
+ * @param entityManager the entity manager to utilize
+ */
+ public UserRepository(EntityManager entityManager) {
+ super(entityManager);
+ setClassType(User.class);
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/service/AlbumDocument.java b/src/main/java/NTNU/IDATT1002/service/AlbumDocument.java
new file mode 100644
index 0000000000000000000000000000000000000000..1c53aaa1ade544c8dde39fdc97967cbfc27154a8
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/service/AlbumDocument.java
@@ -0,0 +1,17 @@
+package NTNU.IDATT1002.service;
+
+import java.io.File;
+
+/**
+ * Album Document Interface. Defines operations for getting and creating documents.
+ *
+ * @author Eirik Steira
+ * @version 1.0 30.03.20
+ */
+public interface AlbumDocument {
+
+ File getDocument();
+
+ void createDocument();
+
+}
diff --git a/src/main/java/NTNU/IDATT1002/service/AlbumService.java b/src/main/java/NTNU/IDATT1002/service/AlbumService.java
new file mode 100644
index 0000000000000000000000000000000000000000..9a1f33407e9003b772ca8f380190fdb39e6a120f
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/service/AlbumService.java
@@ -0,0 +1,188 @@
+package NTNU.IDATT1002.service;
+
+import NTNU.IDATT1002.filters.AlbumFilter;
+import NTNU.IDATT1002.models.Image;
+import NTNU.IDATT1002.models.Album;
+import NTNU.IDATT1002.models.Tag;
+import NTNU.IDATT1002.models.User;
+import NTNU.IDATT1002.repository.AlbumRepository;
+import NTNU.IDATT1002.repository.TagRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.EntityManager;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import static NTNU.IDATT1002.service.TagService.getTagsFromString;
+
+
+/**
+ * Album Service. Supports common domain specific operations such as creating an album,
+ * adding images and tags as well as searching by an arbitrary query.
+ *
+ * @author Eirik Steira
+ * @version 1.0 22.03.20
+ */
+public class AlbumService {
+
+ private AlbumRepository albumRepository;
+
+ private TagRepository tagRepository;
+
+ private Logger logger;
+
+ /**
+ * Inject entity manager instance to the repositories.
+ */
+ public AlbumService(EntityManager entityManager) {
+ this.albumRepository = new AlbumRepository(entityManager);
+ this.tagRepository = new TagRepository(entityManager);
+ logger = LoggerFactory.getLogger("ImageApplicationLogger");
+ }
+
+ public Optional<Album> getAlbumById(Long albumId) {
+ return albumRepository.findById(albumId);
+ }
+
+ /**
+ * Retrieves all albums.
+ *
+ * @return list of all albums.
+ */
+ public List<Album> getAllAlbums() {
+ return albumRepository.findAll();
+ }
+
+ /**
+ * Create a new album with all fields populated.
+ *
+ * @param title the title of the album
+ * @param description the description of the album
+ * @param user the user of the album
+ * @param tags the tags of the album
+ * @param images the images of the album
+ * @return Optional containing the saved album
+ */
+ public Optional<Album> createAlbum(String title,
+ String description,
+ User user,
+ List<Tag> tags,
+ List<Image> images) {
+ Album album = new Album();
+ album.setTitle(title);
+ album.setDescription(description);
+ album.setUser(user);
+ album.setTags(getOrCreateTags(tags));
+ album.setImages(images);
+
+ return albumRepository.save(album);
+ }
+
+ /**
+ * Gets or creates given tags in given list.
+ *
+ * @param tags the list of tags
+ * @return a list of persisted tags
+ */
+ private List<Tag> getOrCreateTags(List<Tag> tags) {
+ return tags.stream()
+ .map(tag -> tagRepository.findOrCreate(tag).orElse(null))
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * Retrieves all albums created by the given user by username.
+ *
+ * @param title the title of the album
+ * @param description the description of the album
+ * @param user the user of the album
+ * @param tagsAsString the tags of the album as strings
+ */
+ public Optional<Album> createAlbum(String title, String description, User user, String tagsAsString) {
+ List<Tag> tags = getTagsFromString(tagsAsString);
+ return createAlbum(title, description, user, tags, new ArrayList<>());
+ }
+
+ /**
+ * Create and return a new document for the album with the given id.
+ * The document is saved to the users dowloads folder.
+ *
+ * @param albumId the album id to get a document for
+ * @return the document created
+ */
+ public AlbumDocument getDocument(Long albumId) {
+ Album album = getAlbumById(albumId)
+ .orElseThrow(IllegalArgumentException::new);
+
+ String destinationFile = String.format("%s/downloads/%s.pdf",
+ System.getProperty("user.home"),
+ album.getTitle());
+
+ AlbumDocument document = new PdfDocument(album, destinationFile);
+ document.createDocument();
+ logger.info("[x] Saved PDF document to " + destinationFile);
+
+ return document;
+ }
+
+ /**
+ * Retrieves all albums created by the given user by username.
+ *
+ * @param user the user to query by
+ * @return list of all albums created by the user
+ */
+ public List<Album> getAlbumFromUser(User user) {
+ return albumRepository.findAllByUsername(user.getUsername());
+ }
+
+
+ /**
+ * Adds the given tag to the given album.
+ *
+ * @param album the album to add the tag to
+ * @param tag the tag to add
+ * @return the updated album
+ */
+ public Optional<Album> addTagToAlbum(Album album, Tag tag) {
+ Album foundAlbum = albumRepository.findById(album.getId())
+ .orElseThrow(IllegalArgumentException::new);
+ Tag foundTag = tagRepository.findOrCreate(tag)
+ .orElseThrow(IllegalArgumentException::new);
+
+ foundAlbum.addTag(foundTag);
+
+ return albumRepository.save(foundAlbum);
+ }
+
+ /**
+ * Add given image to the given album.
+ *
+ * @param album the album to add the image to
+ * @param image the image to add
+ */
+ public Optional<Album> addImageToAlbum(Album album, Image image) {
+ Album foundAlbum = albumRepository.findById(album.getId())
+ .orElseThrow(IllegalArgumentException::new);
+
+ foundAlbum.addImage(image);
+
+ return albumRepository.save(foundAlbum);
+ }
+
+ /**
+ * Search all images by title, description and tags specified in {@link AlbumFilter#filter(String)}.
+ *
+ * @param query the query to filter by
+ * @return list of albums matching the query
+ */
+ public List<Album> searchAlbums(String query) {
+ List<Album> allAlbums = albumRepository.findAll();
+ return allAlbums.stream()
+ .filter(AlbumFilter.filter(query))
+ .collect(Collectors.toList());
+ }
+
+}
diff --git a/src/main/java/NTNU/IDATT1002/service/ImageService.java b/src/main/java/NTNU/IDATT1002/service/ImageService.java
new file mode 100644
index 0000000000000000000000000000000000000000..63607a2de743ad2c52e2ec14bf4b999c99b6dcea
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/service/ImageService.java
@@ -0,0 +1,106 @@
+package NTNU.IDATT1002.service;
+import NTNU.IDATT1002.filters.ImageFilter;
+import NTNU.IDATT1002.models.*;
+import NTNU.IDATT1002.repository.*;
+import NTNU.IDATT1002.utils.ImageUtil;
+import NTNU.IDATT1002.utils.MetaDataExtractor;
+
+import java.util.Arrays;
+import javafx.scene.control.TextField;
+import javax.persistence.EntityManager;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * Image service
+ * @author Stian Mogen, Eirik Steira, madslun
+ * @version 1.0 22.03.2020
+ */
+
+public class ImageService {
+
+ private ImageRepository imageRepository;
+ private MetaDataExtractor metaDataExtractor;
+ private TagService tagService;
+
+ /**
+ * Inject entity manager instance to the repositories.
+ */
+ public ImageService(EntityManager entityManager) {
+ this.imageRepository = new ImageRepository(entityManager);
+ this.metaDataExtractor = new MetaDataExtractor();
+ this.tagService = new TagService(entityManager);
+ }
+
+ /**
+ * Creates a new image from the input File
+ *
+ * @param user the user of the image
+ * @param file the file uploaded
+ * @return Optional containing the saved image
+ */
+ public Optional<Image> createImage(User user, File file, List<Tag> tags) {
+
+ GeoLocation geoLocation = metaDataExtractor.getGeoLocation(file);
+ Histogram histogram = metaDataExtractor.getHistogram(file);
+
+ Image image = new Image();
+ Metadata metadata = new Metadata();
+ metadata.setImage(image);
+ image.setMetadata(metadata);
+
+ metadata.setGeoLocation(geoLocation);
+ geoLocation.setMetadata(metadata);
+
+ metadata.setHistogram(histogram);
+ histogram.setMetadata(metadata);
+ byte[] bFile = ImageUtil.convertToBytes(file.getPath());
+
+ //TODO: Add image tags and add image to album
+ image.setRawImage(bFile);
+ image.setUser(user);
+ image.setPath(file.getPath());
+ image.addTags((ArrayList<Tag>) tagService.getOrCreateTags(tags));
+ return imageRepository.save(image);
+ }
+
+
+ /**
+ * Finds each picture belonging to a specific user
+ * @param user
+ * @return a list with all pictures from a user
+ */
+ public List<Image> getImageFromUser(User user) {
+ return imageRepository.findAllByUsername(user.getUsername());
+ }
+
+ /**
+ * Retrieves all images.
+ *
+ * @return list of all images.
+ */
+ public List<Image> getAllImages() {
+ return imageRepository.findAll();
+ }
+
+ /**
+ * Search all images by tags specified in {@link ImageFilter#filter(String)}.
+ *
+ * @param query the query to filter by
+ * @return list of images matching the query
+ */
+
+ //This search method is for futureproofing, when we will search using additional parameters than just tags
+ public List<Image> searchImages(String query) {
+ List<Image> allImages = imageRepository.findAll();
+ return allImages.stream()
+ .filter(ImageFilter.filter(query))
+ .collect(Collectors.toList());
+ }
+
+
+
+}
diff --git a/src/main/java/NTNU/IDATT1002/service/PdfDocument.java b/src/main/java/NTNU/IDATT1002/service/PdfDocument.java
new file mode 100644
index 0000000000000000000000000000000000000000..adbcc27f814e99ca01d6b8575f63bb8f7b86f9a9
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/service/PdfDocument.java
@@ -0,0 +1,257 @@
+package NTNU.IDATT1002.service;
+
+import NTNU.IDATT1002.models.Image;
+import NTNU.IDATT1002.models.Album;
+import NTNU.IDATT1002.models.Metadata;
+import com.itextpdf.text.*;
+import com.itextpdf.text.pdf.PdfWriter;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Date;
+
+
+/**
+ * Class PdfDocument. Generates a pdf document displaying a given album.
+ *
+ * @author Eirik Steira
+ * @version 1.0 22.03.20
+ */
+public class PdfDocument implements AlbumDocument {
+
+ /**
+ * Height ratio satisfying a 16:9 ratio.
+ */
+ private final double HEIGHT_RATIO = 5.3;
+
+ private Album album;
+
+ private Document document;
+
+ private String DESTINATION_FILE;
+
+ private String defaultTitle = "Album";
+
+ /**
+ * Standard fonts.
+ */
+ private Font headerFont = new Font(Font.FontFamily.TIMES_ROMAN, 18,
+ Font.BOLD);
+ private Font subFont = new Font(Font.FontFamily.TIMES_ROMAN, 16,
+ Font.BOLD);
+ private Font smallFont = new Font(Font.FontFamily.TIMES_ROMAN, 12);
+
+ public PdfDocument(Album album, String DESTINATION_FILE) {
+ this.album = album;
+ this.DESTINATION_FILE = DESTINATION_FILE;
+ this.document = new Document();
+ }
+
+ public File getDocument() {
+ return new File(DESTINATION_FILE);
+ }
+
+ /**
+ * Create a new pdf document.
+ */
+ public void createDocument() {
+ try {
+ generatePdfDocument();
+ } catch (IOException | DocumentException e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Try to generate a pdf document.
+ *
+ * @throws IOException
+ * @throws DocumentException
+ */
+ private void generatePdfDocument() throws IOException, DocumentException {
+ PdfWriter.getInstance(document, new FileOutputStream(DESTINATION_FILE));
+ document.open();
+
+ addHeadlines();
+ addContent();
+
+ document.close();
+ }
+
+ /**
+ * Add default headlines to the document, ie document title, ownership and date.
+ *
+ * @throws DocumentException
+ */
+ private void addHeadlines() throws DocumentException {
+ Paragraph headline = new Paragraph();
+
+ addEmptyLineTo(headline, 1);
+
+ headline.add(new Paragraph(defaultTitle, headerFont));
+ addEmptyLineTo(headline, 1);
+
+ headline.add(new Paragraph(
+ "Generated by: " + album.getUser().getUsername() + ", "
+ + new Date(),
+ smallFont));
+ addEmptyLineTo(headline, 2);
+
+ document.add(headline);
+ }
+
+ /**
+ * Add main content to the document. This entails album meta and all images.
+ *
+ * @throws DocumentException
+ * @throws IOException
+ */
+ private void addContent() throws DocumentException, IOException {
+ addAlbumMeta();
+ addImagesContainer();
+ }
+
+ /**
+ * Add album meta to the document, such as title, user etc.
+ *
+ * @throws DocumentException
+ */
+ private void addAlbumMeta() throws DocumentException {
+ Paragraph albumMeta = new Paragraph();
+ String albumMetaContent = formatAlbumMeta();
+ albumMeta.add(new Paragraph(
+ albumMetaContent,
+ smallFont));
+
+ addEmptyLineTo(albumMeta, 1);
+ document.add(albumMeta);
+ }
+
+ /**
+ * Add container to contain images and a headline.
+ *
+ * @throws DocumentException
+ * @throws IOException
+ */
+ private void addImagesContainer() throws DocumentException, IOException {
+ Paragraph imagesContainer = new Paragraph();
+
+ imagesContainer.add(new Paragraph("Images:", subFont));
+ document.add(imagesContainer);
+ addAllImages();
+ }
+
+ /**
+ * Add all images in the album to the document.
+ *
+ * @throws IOException
+ * @throws DocumentException
+ */
+ private void addAllImages() throws IOException, DocumentException {
+ for (Image image : album.getImages())
+ addSingleImage(image);
+ }
+
+ /**
+ * Add a single image to the document.
+ *
+ * @param image the image to add.
+ * @throws IOException
+ * @throws DocumentException
+ */
+ private void addSingleImage(Image image) throws IOException, DocumentException {
+ com.itextpdf.text.Image displayImage = getImageFileFromBytes(image.getRawImage());
+ scaleImage(displayImage);
+
+ document.add(displayImage);
+ addImageMetaData(image);
+ }
+
+ /**
+ * Convert an array of bytes to {@link com.itextpdf.text.Image}.
+ *
+ * @param imageBytes the array of bytes to convert
+ * @return the image to display
+ * @throws IOException
+ * @throws BadElementException
+ */
+ private com.itextpdf.text.Image getImageFileFromBytes(byte[] imageBytes)
+ throws IOException, BadElementException {
+ return com.itextpdf.text.Image.getInstance(imageBytes);
+ }
+
+ /**
+ * Scale given {@link com.itextpdf.text.Image image} to stretch
+ * half the width of the page, remaining a 16:9 ratio.
+ *
+ * @param image the image to scale
+ */
+ private void scaleImage(com.itextpdf.text.Image image) {
+ float documentWidth = PageSize.A4.getWidth() - 2 * PageSize.A4.getBorder();
+ float scaledHeight = (float) (documentWidth / 2 * HEIGHT_RATIO);
+
+ image.scaleToFit(documentWidth / 2, scaledHeight);
+ }
+
+ /**
+ * Add an images metadata to the document.
+ *
+ * @param image the image holding the metadata
+ * @throws DocumentException
+ */
+ private void addImageMetaData(Image image) throws DocumentException {
+ Metadata metadata = image.getMetadata();
+ if (metadata != null)
+ document.add(new Paragraph(metadata.toString()));
+ }
+
+ /**
+ * Format the album meta.
+ *
+ * @return the formatted album
+ */
+ private String formatAlbumMeta() {
+ return new StringBuilder()
+ .append("Title: ")
+ .append(album.getTitle())
+ .append("\n")
+ .append("User: ")
+ .append(album.getUser().getUsername())
+ .append("\n")
+ .append("Created at: ")
+ .append(album.getCreatedAt())
+ .append("\n")
+ .append("Description: ")
+ .append(album.getDescription())
+ .append("\n")
+ .append("Tags: ")
+ .append(formatTags())
+ .toString();
+ }
+
+ /**
+ * Format the albums tags, separated by a comma.
+ *
+ * @return the formatted tags
+ */
+ private String formatTags() {
+ StringBuilder tags = new StringBuilder();
+ album.getTags().forEach(tag -> tags.append(tag.getName()).append(", "));
+
+ return tags.toString();
+ }
+
+ /**
+ * Add an empty line to the document.
+ *
+ * @param paragraph the paragraph to insert an empty line into
+ * @param number the number of empty lines desired
+ */
+ private void addEmptyLineTo(Paragraph paragraph, int number) {
+ for (int i = 0; i < number; i++) {
+ paragraph.add(new Paragraph(" "));
+ }
+ }
+
+}
diff --git a/src/main/java/NTNU/IDATT1002/service/TagService.java b/src/main/java/NTNU/IDATT1002/service/TagService.java
new file mode 100644
index 0000000000000000000000000000000000000000..f44132cb36567e5d0fa8555c020b4d4710c8909b
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/service/TagService.java
@@ -0,0 +1,91 @@
+package NTNU.IDATT1002.service;
+
+import NTNU.IDATT1002.models.Image;
+import NTNU.IDATT1002.models.Tag;
+
+import NTNU.IDATT1002.repository.ImageRepository;
+import NTNU.IDATT1002.repository.TagRepository;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.persistence.EntityManager;
+
+
+/**
+ * Tag Service. Supports common domain specific operations such as converting a list of tags to a string
+ * and opposite.
+ *
+ * @author Eirik Steira
+ * @version 1.0 26.03.20
+ */
+public class TagService {
+
+TagRepository tagRepository;
+ImageRepository imageRepository;
+
+public TagService(EntityManager entityManager){
+ this.tagRepository = new TagRepository(entityManager);
+ this.imageRepository = new ImageRepository(entityManager);
+
+}
+
+ /**
+ * Retrieves tags from text field and converts them to a list of tag objects.
+ *
+ * @return the list of tag objects
+ */
+ public static List<Tag> getTagsFromString(String tagsAsString) {
+ String[] tags = tagsAsString
+ .trim()
+ .split("[, ?.@]+");
+
+ return Stream.of(tags)
+ .map(Tag::new)
+ .collect(Collectors.toList());
+ }
+
+ /**
+ * Retrieves tags from list of tags and converts them to a concatenated string.
+ *
+ * @param tags the list of tags
+ * @return the tags as a string
+ */
+ public static String getTagsAsString(List<Tag> tags) {
+ return tags.stream()
+ .map(Tag::getName)
+ .collect(Collectors.joining(", "));
+ }
+
+ /**
+ * Gets or creates given tags in given ArrayList.
+ *
+ * @@author Lars Østby
+ * @param tags the list of tags
+ * @return an ArrayList of persisted tags
+ */
+ public List<Tag> getOrCreateTags(List<Tag> tags) {
+ return tags.stream().map(tag -> tagRepository.findOrCreate(tag).orElse(null)).collect(Collectors.toList());
+ }
+
+
+ /**
+ * Adds the given tag to the given album.
+ *
+ * @param image the album to add the tag to
+ * @param tag the tag to add
+ * @return the updated album
+ */
+
+ public Optional<Image> addTagToImage(Image image, Tag tag) {
+ Image foundImage = imageRepository.findById(image.getId())
+ .orElseThrow(IllegalArgumentException::new);
+ Tag foundTag = tagRepository.findOrCreate(tag)
+ .orElseThrow(IllegalArgumentException::new);
+
+ foundImage.addTag(foundTag);
+
+ return imageRepository.save(foundImage);
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/service/UserService.java b/src/main/java/NTNU/IDATT1002/service/UserService.java
new file mode 100644
index 0000000000000000000000000000000000000000..7b549630610d39003c48782b6e5db8f881a17eef
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/service/UserService.java
@@ -0,0 +1,129 @@
+package NTNU.IDATT1002.service;
+
+import NTNU.IDATT1002.ApplicationState;
+import NTNU.IDATT1002.models.Login;
+import NTNU.IDATT1002.models.User;
+import NTNU.IDATT1002.repository.LoginRepository;
+import NTNU.IDATT1002.repository.UserRepository;
+import NTNU.IDATT1002.utils.Authentication;
+
+import javax.persistence.EntityManager;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Optional;
+
+/**
+ * User Service
+ * @author madslun
+ * @version 1.0 22.03.20
+ */
+
+public class UserService {
+
+ private LoginRepository loginRepository;
+ private UserRepository userRepository;
+
+ /**
+ * Inject entity manager instance to the repositories
+ */
+ public UserService(EntityManager entityManager) {
+ this.loginRepository = new LoginRepository(entityManager);
+ this.userRepository = new UserRepository(entityManager);
+ }
+
+ /**
+ * Creates a new user and sets password on the new user
+ *
+ * @param email that will added to the user
+ * @param username that will be registered to the user
+ * @param firstName of the user
+ * @param lastName of the user
+ * @param callingCode of the phone number
+ * @param phoneNumber of the user
+ * @param birthDate of the user
+ * @param password that will be set to login
+ * @return Optional with the user
+ */
+ public Optional<User> createUser(String email, String username, String firstName, String lastName, String callingCode, String phoneNumber, Date birthDate, String password) {
+ User user = new User(username, email, firstName, lastName, callingCode, phoneNumber, birthDate);
+ Login login = new Login(user);
+ setPassword(login, password);
+ return userRepository.save(user);
+ }
+
+ /**
+ * Logs a user in if correct credentials is given
+ *
+ * @param username that will be checked against
+ * @param password that will be compared to database
+ * @return
+ */
+ public boolean logIn(String username, String password) {
+ try {
+ Optional<Login> login = loginRepository.findById(username);
+ if (login.isPresent()) {
+ String salt = login.get().getPasswordSalt();
+ String hash = login.get().getHash();
+ if(Authentication.isCorrectPassword(salt, password, hash)) {
+ ApplicationState.setCurrentUser(login.get().getUser());
+ return true;
+ }
+ }
+ }
+ catch (IllegalArgumentException e) {
+ e.printStackTrace();
+ }
+ return false;
+ }
+
+ /**
+ * Searches for a user by username, checks if the old password matches, sets new password if old is right
+ *
+ * @param username that will be searched for
+ * @param oldPassword that will be compared to database
+ * @param newPassword that will be set
+ * @return
+ */
+ boolean changePassword(String username, String oldPassword, String newPassword) {
+ ArrayList<String> info = new ArrayList<>();
+ try {
+ Optional<Login> login = loginRepository.findById(username);
+ if(login.isPresent()) {
+ String salt = login.get().getPasswordSalt();
+ String expectedHash = login.get().getHash();
+ if(Authentication.isCorrectPassword(salt, oldPassword,expectedHash)) {
+ info = Authentication.setPassword(newPassword);
+ String saltString = info.get(0);
+ String hashString = info.get(1);
+ login.get().setPasswordSalt(saltString);
+ login.get().setHash(hashString);
+
+ loginRepository.save(login.get());
+ return true;
+ }
+ }
+ }
+ catch (IllegalArgumentException e) {
+ e.printStackTrace();
+ }
+ return false;
+ }
+
+ private boolean setPassword(Login login, String password) {
+ ArrayList<String> info = new ArrayList<>();
+ try {
+ info = Authentication.setPassword(password);
+ String saltString = info.get(0);
+ String hashString = info.get(1);
+ login.setPasswordSalt(saltString);
+ login.setHash(hashString);
+ if(loginRepository.save(login).isPresent()) {
+ return true;
+ }
+ }
+ catch (IllegalArgumentException e) {
+ e.printStackTrace();
+ }
+ return false;
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/utils/Authentication.java b/src/main/java/NTNU/IDATT1002/utils/Authentication.java
index a0321ac9d2f4cc2ec99ae391811df2d76c9dacea..a43da0ed5974836bde590401e0b3100c4980879c 100644
--- a/src/main/java/NTNU/IDATT1002/utils/Authentication.java
+++ b/src/main/java/NTNU/IDATT1002/utils/Authentication.java
@@ -1,8 +1,11 @@
package NTNU.IDATT1002.utils;
+import javax.xml.bind.DatatypeConverter;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Random;
public class Authentication {
@@ -15,74 +18,54 @@ public class Authentication {
* @return hashed password
* @throws NoSuchAlgorithmException
*/
- public static boolean setPassword(String username, String password) throws NoSuchAlgorithmException {
+ public static ArrayList<String> setPassword(String password) {
String hashedPassword = null;
- byte[] salt = getSalt();
+ ArrayList<String> info = new ArrayList<>();
StringBuilder sb = new StringBuilder();
- if (username == null || password == null) {
+ if (password == null) {
throw new IllegalArgumentException("Input cannot be null");
}
if(password.isBlank() || password.isEmpty()) {
throw new IllegalArgumentException("Password cannot be blank");
}
- if (username.isEmpty() || username.isBlank()) {
- throw new IllegalArgumentException("Username cannot be blank");
- }
-
- try{
- MessageDigest md = MessageDigest.getInstance("SHA-512");
- md.update(salt);
- byte[] bytes = md.digest(password.getBytes());
-
- //Converts the StringBuilder to hexadecimal
- for(int i = 0; i < bytes.length; i++) {
- sb.append((Integer.toString((bytes[i] & 0xff) + 0x100, 16).substring(1)));
- }
- //Gets the whole hash in hexformat into a string
- hashedPassword = sb.toString();
- }
- catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
- }
-
- //TODO: Need to make database connection here
- return false;
+ return createHash(password);
}
/**
- * Gets hash and salt from database with the username
+ * Gets hash and salt from database with the salt
* Hashes input password with same algorithm and salt as when created
* Compares the expected has and the new hash
- * @param username to get the stored hash on give user
+ * @param salt to get the stored hash on give user
* @param password that will be hashed and compared to original hash
* @return boolean of whether the hashes are similiar or not
*/
- public static boolean isCorrectPassword(String username, String password) {
- //TODO: get password salt and hash with username from db
-
- byte[] dbSalt = null;
- String expectedHash = null;
-
- if(dbSalt == null) {
+ public static boolean isCorrectPassword(String salt, String password, String expectedHash) {
+ if(salt == null) {
throw new IllegalArgumentException("Salt cannot be null");
}
else if(expectedHash == null) {
throw new IllegalArgumentException("Hash cannot be null");
}
- else if(username.isEmpty() || password.isEmpty()) {
+ else if(password == null) {
+ throw new IllegalArgumentException("Password cannot be null");
+ }
+ if(salt.isEmpty() || password.isEmpty()) {
throw new IllegalArgumentException("Input cannot be empty");
}
- if(password.isBlank() || username.isBlank()) {
+ if(password.isBlank() || salt.isBlank()) {
throw new IllegalArgumentException("Password cannot be blank");
}
+ if(expectedHash.isBlank() || expectedHash.isEmpty()) {
+ throw new IllegalArgumentException("Hash from db is blank");
+ }
- String hashedInputPassword = createHashWithPredeterminedSalt(dbSalt, password);
+ byte[] dbSalt = buildBytes(salt);
+ String hashedInputPassword = createHashWithPredeterminedSalt(dbSalt, password);
if(expectedHash.equals(hashedInputPassword)) {
return true;
}
-
return false;
}
@@ -120,10 +103,12 @@ public class Authentication {
* @param password that wil be hashed
* @return hashed password with salt
*/
- private static String createHash(String password) {
+ private static ArrayList<String> createHash(String password) {
StringBuilder sb = new StringBuilder();
+ ArrayList<String> info = new ArrayList<>();
String hashedPassword = null;
byte[] salt = getSalt();
+ String saltAsString = buildHexString(salt);
try {
MessageDigest md = MessageDigest.getInstance("SHA-512");
@@ -139,7 +124,9 @@ public class Authentication {
catch (NoSuchAlgorithmException e ) {
e.printStackTrace();
}
- return hashedPassword;
+ info.add(saltAsString);
+ info.add(hashedPassword);
+ return info;
}
@@ -152,4 +139,32 @@ public class Authentication {
r.nextBytes(salt);
return salt;
}
+
+ /**
+ * Byte-to-Hex converter
+ * @param bytes is an array of byte
+ * @return String bytes in hex
+ */
+ private static String buildHexString(byte[] bytes) {
+ StringBuilder sb = new StringBuilder();
+ for (byte b : bytes) {
+ //Convert from byte to hex
+ sb.append(String.format("%02x", b));
+ }
+ return sb.toString();
+ }
+
+ /**
+ * Hex-to-byte converter
+ * @param hex input to get an byte array
+ * @return byte[] converted from hex
+ */
+ private static byte[] buildBytes(String hex) {
+ byte[] b = new byte[hex.length() / 2];
+ for (int i = 0; i < hex.length(); i+=2) {
+ int v = Integer.parseInt(hex.substring(i, i + 2), 16);
+ b[i/2] = (byte) v;
+ }
+ return b;
+ }
}
diff --git a/src/main/java/NTNU/IDATT1002/utils/CreateUser.java b/src/main/java/NTNU/IDATT1002/utils/CreateUser.java
deleted file mode 100644
index e546a6bfda341c0f7fe1a79fa1d97ecfafc6506c..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/utils/CreateUser.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package NTNU.IDATT1002.utils;
-
-
-public class CreateUser {
-
-
-}
diff --git a/src/main/java/NTNU/IDATT1002/utils/ExtractMetaData.java b/src/main/java/NTNU/IDATT1002/utils/ExtractMetaData.java
deleted file mode 100644
index 91da4f6a3d4345f8a2be2d7a35ddeeb44bbbf5e8..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/utils/ExtractMetaData.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package NTNU.IDATT1002.utils;
-
-import com.drew.imaging.ImageMetadataReader;
-import com.drew.imaging.ImageProcessingException;
-import com.drew.metadata.Directory;
-import com.drew.metadata.Metadata;
-import com.drew.metadata.MetadataException;
-import com.drew.metadata.Tag;
-import com.drew.metadata.exif.*;
-import com.drew.metadata.jpeg.JpegDirectory;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-
-
-public class ExtractMetaData {
-
- private final File image;
-
- public ExtractMetaData(File image) {
- this.image = image;
- }
-
- /**
- * Extracts all data possible for a image
- *
- * @return
- * @throws ImageProcessingException
- * @throws IOException
- */
- public String getAll() throws ImageProcessingException, IOException {
- Metadata metadata = ImageMetadataReader.readMetadata(this.image);
- String text = "";
- for (Directory d : metadata.getDirectories()) {
- for (Tag t : d.getTags()) {
- text += t.toString() + " | ";
- }
- }
- text += "\n";
- return text;
- }
-
- /**
- * Returns a string with the image dimension
- *
- * @return
- * @throws ImageProcessingException
- * @throws IOException
- * @throws MetadataException
- */
- private String getDimension() throws ImageProcessingException, IOException, MetadataException {
- try {
- String dimension = "Dimension: ";
-
- Metadata metadata = ImageMetadataReader.readMetadata(this.image);
-
- JpegDirectory jpeg = metadata.getFirstDirectoryOfType(JpegDirectory.class);
- dimension += jpeg.getImageHeight();
- dimension += "x";
- dimension += jpeg.getImageWidth();
- return dimension;
- } catch (NullPointerException e) {
-
- }
- return "No dimension found";
- }
-
- /**
- * Returns a string with the GPS position
- *
- * @return
- * @throws ImageProcessingException
- * @throws IOException
- * @throws MetadataException
- */
- private String getGPS() throws ImageProcessingException, IOException, MetadataException {
- try {
- String gps = "";
-
- Metadata metadata = ImageMetadataReader.readMetadata(this.image);
-
- GpsDirectory gpspos = metadata.getFirstDirectoryOfType(GpsDirectory.class);
- gps += "GPS position: " + gpspos.getGeoLocation();
-
- return gps;
- } catch (NullPointerException e) {
-
- }
- return "No GPS information found";
- }
-
- /**
- * Returns all predetermined metadata as an ArrayList
- * @return
- * @throws IOException
- * @throws MetadataException
- * @throws ImageProcessingException
- */
- public ArrayList<String> getNecessary() throws IOException, MetadataException, ImageProcessingException {
- ArrayList<String> information = new ArrayList<String>();
-
- information.add(getGPS());
- information.add(getDimension());
-
- return information;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/NTNU/IDATT1002/utils/ImageUtil.java b/src/main/java/NTNU/IDATT1002/utils/ImageUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..72fc10ba03582243eb73f229c00c551a5d4d3225
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/utils/ImageUtil.java
@@ -0,0 +1,52 @@
+package NTNU.IDATT1002.utils;
+
+
+import NTNU.IDATT1002.models.Image;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+
+
+/**
+ * Image Util class for performing {@link Image} related utility operations,
+ * such as converting a file to a byte array and {@link Image} to {@link javafx.scene.image.Image}.
+ */
+public class ImageUtil {
+
+ /**
+ * Convert the file on the given path to a byte array.
+ *
+ * @param path the path to the file to be converted
+ * @return the file, represented as a byte array
+ */
+ public static byte[] convertToBytes(String path) {
+ File file = new File(path);
+ byte[] byteFile = new byte[(int) file.length()];
+
+ try {
+ FileInputStream fileInputStream = new FileInputStream(file);
+ fileInputStream.read(byteFile);
+ fileInputStream.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ return byteFile;
+ }
+
+ /**
+ * Convert the given domain image to a javafx image which can be displayed by a controller.
+ *
+ * @param image the image to convert
+ * @return the converted image.
+ */
+ public static javafx.scene.image.Image convertToFXImage(Image image) {
+ ByteArrayInputStream inputStream = ImageUtil.getInputStream(image);
+ return new javafx.scene.image.Image(inputStream);
+ }
+
+ private static ByteArrayInputStream getInputStream(Image image) {
+ return new ByteArrayInputStream(image.getRawImage());
+ }
+}
diff --git a/src/main/java/NTNU/IDATT1002/utils/MetaDataExtractor.java b/src/main/java/NTNU/IDATT1002/utils/MetaDataExtractor.java
new file mode 100644
index 0000000000000000000000000000000000000000..5c0b6b091abde2ced6e177ffe447089e9eb39945
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/utils/MetaDataExtractor.java
@@ -0,0 +1,97 @@
+package NTNU.IDATT1002.utils;
+
+import NTNU.IDATT1002.database.EntityManagerConfig;
+import NTNU.IDATT1002.models.GeoLocation;
+import NTNU.IDATT1002.models.Histogram;
+import NTNU.IDATT1002.repository.GeoLocatioRepository;
+import NTNU.IDATT1002.repository.HistorgramRepository;
+import com.drew.imaging.ImageMetadataReader;
+import com.drew.imaging.ImageProcessingException;
+import com.drew.metadata.Metadata;
+import com.drew.metadata.MetadataException;
+import com.drew.metadata.exif.GpsDirectory;
+
+import javax.persistence.EntityManager;
+import java.io.File;
+import java.io.IOException;
+
+
+/**
+ * Class MetaDataExtractor. Extracts metadata and geolocation and histogram from it.
+ */
+public class MetaDataExtractor {
+
+ private GeoLocatioRepository geoLocationRepository;
+ private HistorgramRepository historgramRepository;
+
+ public MetaDataExtractor() {
+ EntityManager entityManager = EntityManagerConfig.getEntityManager();
+
+ this.historgramRepository = new HistorgramRepository(entityManager);
+ this.geoLocationRepository = new GeoLocatioRepository(entityManager);
+ }
+
+ /**
+ * Returns a string with the GPS position
+ *
+ * @return
+ * @throws ImageProcessingException
+ * @throws IOException
+ * @throws MetadataException
+ */
+ public GeoLocation getGeoLocation(File file) {
+ String gps = "";
+ String latitude = "";
+ String longitude = "";
+ GeoLocation geoLocation = new GeoLocation("0", "0");
+
+ try {
+ Metadata metadata = ImageMetadataReader.readMetadata(file);
+
+ GpsDirectory gpspos = metadata.getFirstDirectoryOfType(GpsDirectory.class);
+ gps += gpspos.getGeoLocation();
+ String[] pos = gps.split(", ");
+ latitude = pos[0];
+ longitude = pos[1];
+
+ geoLocation.setLatitude(latitude);
+ geoLocation.setLongitude(longitude);
+ }
+ catch (NullPointerException | ImageProcessingException | IOException e) {
+ e.printStackTrace();
+ }
+ return geoLocation;
+ }
+
+ /**
+ * TODO: Decide what data to store.
+ *
+ * @param file
+ * @return
+ */
+ public Histogram getHistogram(File file) {
+// Metadata metadata = null;
+//
+// try {
+// metadata = ImageMetadataReader.readMetadata(file);
+// } catch (IOException | ImageProcessingException e) {
+// e.printStackTrace();
+// }
+//
+// StringBuilder data = new StringBuilder();
+// assert metadata != null;
+// for(Directory d : metadata.getDirectories()) {
+// for (Tag t : d.getTags()) {
+// data.append(t.toString()).append(" | ");
+// }
+// }
+// histogram.setData(data.toString());
+
+
+ Histogram histogram = new Histogram();
+ histogram.setData("INSERT DATA HERE");
+
+ return histogram;
+ }
+
+}
diff --git a/src/main/java/NTNU/IDATT1002/utils/MultiplePhotos.java b/src/main/java/NTNU/IDATT1002/utils/MultiplePhotos.java
deleted file mode 100644
index b21c3624f54077cdaf5b097555b6f22650ad7fae..0000000000000000000000000000000000000000
--- a/src/main/java/NTNU/IDATT1002/utils/MultiplePhotos.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package NTNU.IDATT1002.utils;
-
-import com.drew.imaging.ImageProcessingException;
-import com.drew.metadata.MetadataException;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-
-public class MultiplePhotos {
-
-
- private final ArrayList<File> images;
-
- public MultiplePhotos(ArrayList<File> images) {
- this.images = images;
- }
-
- private ArrayList<String> extractAll() throws ImageProcessingException, MetadataException, IOException {
- ArrayList<String> data = new ArrayList<String>();
-
- for(File i : this.images) {
- ExtractMetaData e = new ExtractMetaData(i);
- String n = e.getAll().toString();
- data.add(n);
- }
- return data;
- }
-}
diff --git a/src/main/resources/Images/Sequences/Login.png b/src/main/resources/Images/Sequences/Login.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce5192508b0cad2c58c552416483b9639029670b
Binary files /dev/null and b/src/main/resources/Images/Sequences/Login.png differ
diff --git a/src/main/resources/Images/Sequences/SignUp.png b/src/main/resources/Images/Sequences/SignUp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0cd18708f2c63e322e654375b34e5a2eb915dfc
Binary files /dev/null and b/src/main/resources/Images/Sequences/SignUp.png differ
diff --git a/src/main/resources/Images/vector1.jpg b/src/main/resources/Images/vector1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..40b88b1a7fddb172b56899c7385ecee3c20cb8e2
Binary files /dev/null and b/src/main/resources/Images/vector1.jpg differ
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index e920adae25251e23bdcc426728ef9b1a07c3e349..80c59c495accc250529875a987c8fa15533b4798 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -9,15 +9,20 @@
<!-- Entity classes -->
<class>NTNU.IDATT1002.models.User</class>
+ <class>NTNU.IDATT1002.models.Login</class>
<class>NTNU.IDATT1002.models.Image</class>
- <class>NTNU.IDATT1002.models.ImageAlbum</class>
+ <class>NTNU.IDATT1002.models.Album</class>
+ <class>NTNU.IDATT1002.models.Tag</class>
+ <class>NTNU.IDATT1002.models.Metadata</class>
+ <class>NTNU.IDATT1002.models.Histogram</class>
+ <class>NTNU.IDATT1002.models.GeoLocation</class>
<properties>
<!-- Configuring JDBC properties -->
<property name="javax.persistence.jdbc.driver" value="com.mysql.cj.jdbc.Driver" />
- <property name="javax.persistence.jdbc.url" value="jdbc:mysql://db-mysql-lon1-07155-do-user-7212587-0.a.db.ondigitalocean.com:25060/image_application" />
- <property name="javax.persistence.jdbc.user" value="doadmin" />
- <property name="javax.persistence.jdbc.password" value="s4oxtqu20e8r7tx5" />
+ <property name="javax.persistence.jdbc.url" value="jdbc:mysql://mysql.stud.iie.ntnu.no:3306/g_sysutv_14" />
+ <property name="javax.persistence.jdbc.user" value="g_sysutv_14" />
+ <property name="javax.persistence.jdbc.password" value="tNdTRrwM" />
<!-- Hibernate properties -->
<property name="hibernate.dialect" value="org.hibernate.dialect.MySQL8Dialect"/>
@@ -26,8 +31,8 @@
<property name="hibernate.format_sql" value="true"/>
<property name="hibernate.use_sql_comments" value="true"/>
- <!-- Drop and create tables on startup -->
- <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+ <!-- Update tables on startup -->
+ <property name="hibernate.hbm2ddl.auto" value="update" />
</properties>
</persistence-unit>
</persistence>
\ No newline at end of file
diff --git a/src/main/resources/NTNU/IDATT1002/create_album.fxml b/src/main/resources/NTNU/IDATT1002/create_album.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..d8bd5fc47411aa662dc6904f2e034c1430efbd64
--- /dev/null
+++ b/src/main/resources/NTNU/IDATT1002/create_album.fxml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+
+<VBox xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.CreateAlbum">
+ <children>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
+ <HBox prefHeight="981.0" prefWidth="1920.0" VBox.vgrow="ALWAYS">
+ <children>
+ <VBox prefHeight="200.0" prefWidth="250.0" HBox.hgrow="ALWAYS" />
+ <VBox alignment="CENTER" prefHeight="981.0" prefWidth="1000.0">
+ <children>
+ <VBox alignment="CENTER" maxWidth="662.0" prefHeight="850.0" prefWidth="671.0" spacing="10.0">
+ <children>
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="ALBUMTITLE:">
+ <font>
+ <Font name="System Bold" size="36.0" />
+ </font>
+ </Text>
+ <TextField fx:id="album_title_field" prefHeight="40.0" prefWidth="488.0" promptText="Insert title here" />
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="ALBUMTAGS:">
+ <font>
+ <Font name="System Bold" size="24.0" />
+ </font>
+ </Text>
+ <TextField fx:id="album_tag_field" prefHeight="32.0" prefWidth="564.0" promptText="#Blue, #water, #summer, etc..." />
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="ALBUMDESCRIPTION:">
+ <font>
+ <Font name="System Bold" size="24.0" />
+ </font>
+ </Text>
+ <TextArea fx:id="album_desc_field" prefHeight="140.0" prefWidth="739.0" promptText="Insert description here" />
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="INCLUDED METADATA:">
+ <font>
+ <Font name="System Bold" size="24.0" />
+ </font>
+ </Text>
+ <Pane fx:id="metadata_pane" prefHeight="373.0" prefWidth="739.0" style="-fx-background-color: #ffff;" />
+ <HBox alignment="CENTER" prefHeight="41.0" prefWidth="662.0" spacing="20.0">
+ <children>
+ <Button fx:id="add_images_button" mnemonicParsing="false" text="ADD IMAGES">
+ <font>
+ <Font name="System Bold" size="18.0" />
+ </font>
+ </Button>
+ <Button fx:id="create_album_button" mnemonicParsing="false" onAction="#createEmptyAlbum" text="CREATE ALBUM">
+ <font>
+ <Font name="System Bold" size="18.0" />
+ </font>
+ </Button>
+ </children>
+ </HBox>
+ </children>
+ </VBox>
+ </children>
+ </VBox>
+ <ScrollPane hbarPolicy="NEVER" prefHeight="920.0" prefWidth="450.0">
+ <content>
+ <VBox alignment="TOP_CENTER" prefWidth="450.0" spacing="10.0">
+ <children>
+ <ImageView fitHeight="218.0" fitWidth="328.0" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/placeholder-1920x1080.png" />
+ </image>
+ </ImageView>
+ </children>
+ <padding>
+ <Insets top="65.0" />
+ </padding>
+ </VBox>
+ </content>
+ </ScrollPane>
+ <VBox prefHeight="200.0" prefWidth="250.0" HBox.hgrow="ALWAYS" />
+ </children>
+ </HBox>
+ </children>
+</VBox>
diff --git a/src/main/resources/NTNU/IDATT1002/explore.fxml b/src/main/resources/NTNU/IDATT1002/explore.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..b693aeeb5467d2be9a916829c2eb80cec43939c2
--- /dev/null
+++ b/src/main/resources/NTNU/IDATT1002/explore.fxml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.RowConstraints?>
+
+<AnchorPane maxHeight="1080.0" maxWidth="1920.0" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.Explore">
+ <children>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
+ <ScrollPane fx:id="scrollPane" fitToWidth="true" hbarPolicy="NEVER" layoutY="100.0" prefHeight="980.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="100.0">
+ <content>
+ <AnchorPane maxHeight="1920.0" minHeight="0.0" minWidth="0.0" prefHeight="2000.0" prefWidth="1920.0">
+ <children>
+ <BorderPane prefHeight="2000.0" prefWidth="1920.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+ <top>
+ <Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER" />
+ </top>
+ <left>
+ <Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER" />
+ </left>
+ <right>
+ <Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER" />
+ </right>
+ <center>
+ <GridPane fx:id="gridPane" alignment="CENTER" BorderPane.alignment="CENTER">
+ <columnConstraints>
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+ </columnConstraints>
+ <rowConstraints>
+ <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+ <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+ <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+ <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+ <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+ </rowConstraints>
+ </GridPane>
+ </center>
+ <bottom>
+ <Pane prefHeight="150.0" prefWidth="1920.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER">
+ <children>
+ <HBox alignment="CENTER" layoutY="-2.0" prefHeight="84.0" prefWidth="1920.0" spacing="20.0">
+ <children>
+ <Button fx:id="footer_previousBtn" mnemonicParsing="false" onAction="#switchToPrevious" text="PREVIOUS" />
+ <Button fx:id="footer_nextBtn" layoutX="944.0" layoutY="48.0" mnemonicParsing="false" onAction="#switchToNext" text="NEXT" />
+ </children>
+ </HBox>
+ </children></Pane>
+ </bottom>
+ </BorderPane>
+ </children></AnchorPane>
+ </content>
+ </ScrollPane>
+ </children>
+</AnchorPane>
diff --git a/src/main/resources/NTNU/IDATT1002/explore_albums.fxml b/src/main/resources/NTNU/IDATT1002/explore_albums.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..a74f9f1e3bc2aee7ad79607922902ae9fe29f95e
--- /dev/null
+++ b/src/main/resources/NTNU/IDATT1002/explore_albums.fxml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.String?>
+<?import javafx.collections.FXCollections?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+
+<VBox prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.ExploreAlbums">
+ <children>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
+ <HBox alignment="CENTER" prefHeight="990.0" prefWidth="1920.0" VBox.vgrow="ALWAYS">
+ <children>
+ <ScrollPane fx:id="scrollpane" fitToWidth="true" hbarPolicy="NEVER" prefWidth="1920.0" HBox.hgrow="ALWAYS">
+ <content>
+ <BorderPane AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+ <left>
+ <Pane minHeight="300.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER" />
+ </left>
+ <right>
+ <Pane minHeight="300.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER" />
+ </right>
+ <bottom>
+ <Pane prefHeight="250.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER">
+ <children>
+ <HBox alignment="CENTER" layoutY="-2.0" prefHeight="84.0" prefWidth="1920.0" spacing="20.0" />
+ </children>
+ </Pane>
+ </bottom>
+ <center>
+ <VBox fx:id="vBox" maxHeight="1.7976931348623157E308" maxWidth="Infinity" minHeight="980.0" spacing="10.0" style="-fx-background-color: #555555;" BorderPane.alignment="CENTER">
+ </VBox>
+ </center>
+ <top>
+ <VBox prefHeight="250.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER">
+ <children>
+ <HBox alignment="CENTER" prefHeight="107.0" prefWidth="1905.0">
+ <children>
+ <Button fx:id="createAlbumButton" mnemonicParsing="false" onAction="#switchToCreateAlbum" text="CREATE ALBUM">
+ <font>
+ <Font name="System Bold" size="24.0" />
+ </font>
+ </Button>
+ </children>
+ </HBox>
+ <HBox alignment="CENTER" prefHeight="80.0" prefWidth="1905.0" spacing="10.0">
+ <children>
+ <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="Found">
+ <font>
+ <Font size="36.0" />
+ </font>
+ </Text>
+ <Text fx:id="albumAmount" fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="X">
+ <font>
+ <Font name="System Bold Italic" size="36.0" />
+ </font>
+ </Text>
+ <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="albums, sorted by:">
+ <font>
+ <Font size="36.0" />
+ </font>
+ </Text>
+ <ChoiceBox fx:id="sortedByChoicebox" prefHeight="40.0" prefWidth="166.0" value="Most Popular">
+ <items>
+ <FXCollections fx:factory="observableArrayList">
+ <String fx:value="Most Popular" />
+ <String fx:value="Newest First" />
+ <String fx:value="Oldest First" />
+ </FXCollections>
+ </items>
+ </ChoiceBox>
+ </children>
+ </HBox>
+ </children>
+ <opaqueInsets>
+ <Insets />
+ </opaqueInsets>
+ <padding>
+ <Insets top="20.0" />
+ </padding>
+ </VBox>
+ </top>
+ </BorderPane>
+ </content>
+ </ScrollPane>
+ </children>
+ </HBox>
+ </children>
+</VBox>
diff --git a/src/main/resources/NTNU/IDATT1002/explore_page.fxml b/src/main/resources/NTNU/IDATT1002/explore_page.fxml
deleted file mode 100644
index 73ffebaed3b9711b4c26da4331f1a8bfa2d391d3..0000000000000000000000000000000000000000
--- a/src/main/resources/NTNU/IDATT1002/explore_page.fxml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.RowConstraints?>
-
-<AnchorPane maxHeight="1080.0" maxWidth="1920.0" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.ExploreController">
- <children>
- <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
- <children>
- <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/PlaceholderLogo.png" />
- </image>
- </ImageView>
- <Pane prefHeight="100.0" prefWidth="343.0" />
- <TextField fx:id="tbar_search" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
- <Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
- </children>
- </HBox>
- <ScrollPane fx:id="scrollpane" hbarPolicy="NEVER" layoutY="100.0" prefHeight="980.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="100.0">
- <content>
- <AnchorPane maxHeight="1920.0" minHeight="0.0" minWidth="0.0" prefHeight="2000.0" prefWidth="1920.0">
- <children>
- <BorderPane prefHeight="2000.0" prefWidth="1920.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
- <top>
- <Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER" />
- </top>
- <left>
- <Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER" />
- </left>
- <right>
- <Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER" />
- </right>
- <center>
- <GridPane alignment="CENTER" BorderPane.alignment="CENTER">
- <columnConstraints>
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
- </columnConstraints>
- <rowConstraints>
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- </rowConstraints>
- <children>
- <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" />
- <ImageView fitHeight="150.0" fitWidth="200.0" layoutX="10.0" layoutY="105.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" />
- <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="2" />
- <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" GridPane.rowIndex="1" />
- <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" GridPane.rowIndex="1" />
- <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="2" GridPane.rowIndex="1" />
- <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" GridPane.rowIndex="2">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" GridPane.rowIndex="2" />
- <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="2" GridPane.rowIndex="2">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" GridPane.rowIndex="3" />
- <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
- <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="2" GridPane.rowIndex="3">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" GridPane.rowIndex="4" />
- <ImageView fitHeight="245.0" fitWidth="368.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" GridPane.rowIndex="4">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <ImageView fitHeight="150.0" fitWidth="200.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="2" GridPane.rowIndex="4">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <ImageView fitHeight="112.0" fitWidth="200.0">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <ImageView fitHeight="112.0" fitWidth="200.0" GridPane.columnIndex="1">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <ImageView fitHeight="112.0" fitWidth="200.0" GridPane.columnIndex="2">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <ImageView fitHeight="112.0" fitWidth="200.0" GridPane.rowIndex="1">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <ImageView fitHeight="112.0" fitWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <ImageView fitHeight="112.0" fitWidth="200.0" GridPane.columnIndex="2" GridPane.rowIndex="1">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <ImageView fitHeight="112.0" fitWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <ImageView fitHeight="112.0" fitWidth="200.0" GridPane.rowIndex="3">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <ImageView fitHeight="112.0" fitWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="3">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <ImageView fitHeight="112.0" fitWidth="200.0" GridPane.rowIndex="4">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- </children>
- </GridPane>
- </center>
- <bottom>
- <Pane prefHeight="150.0" prefWidth="1920.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER">
- <children>
- <HBox alignment="CENTER" layoutY="-2.0" prefHeight="84.0" prefWidth="1920.0" spacing="20.0">
- <children>
- <Button fx:id="footer_previous_page" mnemonicParsing="false" onAction="#switchToPrevious" text="PREVIOUS" />
- <Button fx:id="footer_next_page" layoutX="944.0" layoutY="48.0" mnemonicParsing="false" onAction="#switchToNext" text="NEXT" />
- </children>
- </HBox>
- </children></Pane>
- </bottom>
- </BorderPane>
- </children></AnchorPane>
- </content>
- </ScrollPane>
- </children>
-</AnchorPane>
diff --git a/src/main/resources/NTNU/IDATT1002/login.fxml b/src/main/resources/NTNU/IDATT1002/login.fxml
index 93175963fe8fb52f92363440ceca60870ed5195a..9b01ce7714d7117ee3ebd26d50d85dddc2386a00 100644
--- a/src/main/resources/NTNU/IDATT1002/login.fxml
+++ b/src/main/resources/NTNU/IDATT1002/login.fxml
@@ -1,23 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.PasswordField?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Text?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
-<VBox alignment="CENTER" prefHeight="1080.0" prefWidth="1920.0" spacing="20.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.LoginController">
+<VBox alignment="CENTER" prefHeight="1080.0" prefWidth="1920.0" spacing="20.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.Login">
<children>
<Label text="Login Page" />
- <GridPane hgap="10.0" maxWidth="300.0" prefHeight="90.0" prefWidth="200.0" vgap="10.0">
+ <GridPane hgap="10.0" maxWidth="339.0" prefHeight="98.0" prefWidth="339.0" vgap="10.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="5.0" prefWidth="70.0" />
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="30.0" />
+ <ColumnConstraints hgrow="SOMETIMES" maxWidth="167.0" minWidth="10.0" prefWidth="147.0" />
+ <ColumnConstraints hgrow="SOMETIMES" maxWidth="97.0" minWidth="10.0" prefWidth="57.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -27,10 +22,11 @@
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Username:" GridPane.halignment="RIGHT" />
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Password:" GridPane.halignment="RIGHT" GridPane.rowIndex="1" />
- <TextField GridPane.columnIndex="1" />
- <PasswordField GridPane.columnIndex="1" GridPane.rowIndex="1" />
- <Button fx:id="primaryButton" onAction="#switchToSecondary" text="Sign Up" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2" />
- <Button fx:id="primaryButton1" layoutX="171.0" layoutY="74.0" onAction="#switchToLoggedIn" text="Log In" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowIndex="2" />
+ <TextField fx:id="Username" prefWidth="157.0" GridPane.columnIndex="1" />
+ <PasswordField fx:id="Password" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+ <Button fx:id="signup" onAction="#switchToSignup" text="Sign Up" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2" />
+ <Button fx:id="login" layoutX="171.0" layoutY="74.0" onAction="#login" text="Log In" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowIndex="2" />
+ <Text fx:id="error_msg" strokeType="OUTSIDE" strokeWidth="0.0" wrappingWidth="270.13671875" GridPane.columnIndex="2" GridPane.rowIndex="1" />
</children>
<padding>
<Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
diff --git a/src/main/resources/NTNU/IDATT1002/logged-in.fxml b/src/main/resources/NTNU/IDATT1002/main.fxml
similarity index 68%
rename from src/main/resources/NTNU/IDATT1002/logged-in.fxml
rename to src/main/resources/NTNU/IDATT1002/main.fxml
index c6d85c728fa1531738310645f286383249108e85..90b751e00f5d1c647dd1b1a913815bff77f21541 100644
--- a/src/main/resources/NTNU/IDATT1002/logged-in.fxml
+++ b/src/main/resources/NTNU/IDATT1002/main.fxml
@@ -10,21 +10,22 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
-<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.LoggedInController">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.Main">
<children>
<VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
- <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="200.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
- <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../../Images/PlaceholderLogo.png" />
</image>
</ImageView>
<Pane prefHeight="100.0" prefWidth="343.0" />
- <TextField fx:id="tbar_search" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_searchButton" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
<Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
<Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
<Pane prefHeight="100.0" prefWidth="174.0" />
<Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
@@ -32,7 +33,7 @@
</HBox>
<HBox alignment="CENTER" prefHeight="982.0" prefWidth="1920.0">
<children>
- <Button fx:id="main_upload" mnemonicParsing="false" text="UPLOAD">
+ <Button fx:id="uploadBtn" mnemonicParsing="false" onAction="#switchToUpload" text="UPLOAD">
<font>
<Font size="60.0" />
</font>
diff --git a/src/main/resources/NTNU/IDATT1002/map.fxml b/src/main/resources/NTNU/IDATT1002/map.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..93ee13ccc007278da11b70944127130dc1fcb255
--- /dev/null
+++ b/src/main/resources/NTNU/IDATT1002/map.fxml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+<?import javafx.scene.web.WebView?>
+
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.Map">
+ <children>
+ <VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+ <children>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
+ <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="183.0" prefWidth="1918.0" style="-fx-background-color: #888888;">
+ <children>
+ <HBox alignment="CENTER" prefHeight="183.0" prefWidth="1920.0" spacing="20.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+ <children>
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="SEARCH:">
+ <font>
+ <Font name="System Bold" size="24.0" />
+ </font>
+ </Text>
+ <TextField fx:id="search" prefHeight="44.0" prefWidth="664.0" promptText="Search for your location">
+ <font>
+ <Font size="18.0" />
+ </font>
+ </TextField>
+ <Button fx:id="searchBtn" mnemonicParsing="false" onAction="#MapSearch" prefHeight="44.0" prefWidth="99.0" text="SEARCH">
+ <font>
+ <Font size="18.0" />
+ </font>
+ </Button>
+ </children>
+ </HBox>
+ </children>
+ </AnchorPane>
+ <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="797.0" prefWidth="1920.0" style="-fx-background-color: #888888;" VBox.vgrow="ALWAYS">
+ <children>
+ <WebView prefHeight="717.0" prefWidth="1920.0" AnchorPane.bottomAnchor="80.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+ <Text layoutX="598.0" layoutY="378.0" strokeType="OUTSIDE" strokeWidth="0.0" text="MAP WILL BE INTEGRATED LATER." textAlignment="CENTER" AnchorPane.bottomAnchor="406.953125" AnchorPane.topAnchor="326.046875">
+ <font>
+ <Font size="48.0" />
+ </font>
+ </Text>
+ </children>
+ </AnchorPane>
+ </children>
+ </VBox>
+ </children>
+</AnchorPane>
diff --git a/src/main/resources/NTNU/IDATT1002/search.fxml b/src/main/resources/NTNU/IDATT1002/search.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..9637518faa77e7b2175de2b0101a9fba4d16a1aa
--- /dev/null
+++ b/src/main/resources/NTNU/IDATT1002/search.fxml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.String?>
+<?import javafx.collections.FXCollections?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+
+<VBox prefHeight="1080.0" prefWidth="1920.0" style="-fx-background-color: #555555;" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.Search">
+ <children>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
+ <HBox alignment="CENTER" prefHeight="986.0" prefWidth="1920.0" style="-fx-background-color: #555555;" VBox.vgrow="ALWAYS">
+ <children>
+ <ScrollPane fx:id="scrollpane" fitToWidth="true" hbarPolicy="NEVER" maxWidth="1.7976931348623157E308" minHeight="960.0" prefWidth="1920.0" style="-fx-background-color: #555555; -fx-fit-to-width: true;" HBox.hgrow="ALWAYS">
+ <content>
+ <VBox fx:id="vBox" maxHeight="1.7976931348623157E308" maxWidth="Infinity" minHeight="980.0" prefWidth="1920.0" spacing="10.0" style="-fx-background-color: #555555;">
+ <children>
+ <HBox alignment="CENTER" maxWidth="Infinity" prefHeight="201.0" prefWidth="1920.0" spacing="10.0">
+ <children>
+ <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="Found">
+ <font>
+ <Font size="36.0" />
+ </font>
+ </Text>
+ <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="X">
+ <font>
+ <Font name="System Bold Italic" size="36.0" />
+ </font>
+ </Text>
+ <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="results for your search" wrappingWidth="350.982421875">
+ <font>
+ <Font size="36.0" />
+ </font>
+ </Text>
+ <Text fx:id="search_result" fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text=""result"">
+ <font>
+ <Font name="System Italic" size="36.0" />
+ </font>
+ </Text>
+ <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text=", sorted by:" wrappingWidth="184.341796875">
+ <font>
+ <Font size="36.0" />
+ </font>
+ </Text>
+ <ChoiceBox fx:id="sorted_by_choicebox" prefHeight="40.0" prefWidth="166.0" value="Most Popular">
+ <items>
+ <FXCollections fx:factory="observableArrayList">
+ <String fx:value="Most Popular" />
+ <String fx:value="Newest First" />
+ <String fx:value="Oldest First" />
+ </FXCollections>
+ </items>
+ </ChoiceBox>
+ </children>
+ </HBox>
+ </children>
+ </VBox>
+ </content>
+ </ScrollPane>
+ </children>
+ </HBox>
+ </children>
+</VBox>
diff --git a/src/main/resources/NTNU/IDATT1002/search_page.fxml b/src/main/resources/NTNU/IDATT1002/search_page.fxml
deleted file mode 100644
index 0ee98bc93d1d1d0de35c6534f223aed8f6801bed..0000000000000000000000000000000000000000
--- a/src/main/resources/NTNU/IDATT1002/search_page.fxml
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.String?>
-<?import javafx.collections.FXCollections?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ChoiceBox?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
-
-<AnchorPane maxHeight="1080.0" maxWidth="1920.0" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.SearchPageController">
- <children>
- <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
- <children>
- <ImageView fx:id="tbar_logo1" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/PlaceholderLogo.png" />
- </image>
- </ImageView>
- <Pane prefHeight="100.0" prefWidth="561.0" />
- <TextField fx:id="tbar_search1" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_map1" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
- <Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload1" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="40.0" prefWidth="114.0" text="UPLOAD" />
- </children>
- </HBox>
- <ScrollPane fx:id="scrollpane" hbarPolicy="NEVER" layoutY="100.0" prefHeight="980.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="100.0">
- <content>
- <AnchorPane maxHeight="1920.0" minHeight="0.0" minWidth="0.0" prefHeight="2000.0" prefWidth="1920.0">
- <children>
- <BorderPane prefHeight="2000.0" prefWidth="1920.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
- <top>
- <Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER">
- <children>
- <Text fill="WHITE" layoutX="337.0" layoutY="113.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Found">
- <font>
- <Font size="36.0" />
- </font>
- </Text>
- <Text fill="WHITE" layoutX="465.0" layoutY="113.0" strokeType="OUTSIDE" strokeWidth="0.0" text="X">
- <font>
- <Font name="System Bold Italic" size="36.0" />
- </font>
- </Text>
- <Text fill="WHITE" layoutX="513.0" layoutY="113.0" strokeType="OUTSIDE" strokeWidth="0.0" text="results for your search, sorted by:">
- <font>
- <Font size="36.0" />
- </font>
- </Text>
- <ChoiceBox layoutX="1063.0" layoutY="78.0" prefHeight="40.0" prefWidth="166.0" value="Most Popular">
- <items>
- <FXCollections fx:factory="observableArrayList">
- <String fx:value="Most Popular" />
- <String fx:value="Newest First" />
- <String fx:value="Oldest First" />
- </FXCollections>
- </items>
- </ChoiceBox>
- </children></Pane>
- </top>
- <left>
- <Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER" />
- </left>
- <right>
- <Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER" />
- </right>
- <center>
- <GridPane alignment="CENTER" BorderPane.alignment="CENTER">
- <columnConstraints>
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
- </columnConstraints>
- <rowConstraints>
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- </rowConstraints>
- <children>
- <Pane prefHeight="200.0" prefWidth="200.0">
- <children>
- <ImageView fitHeight="307.0" fitWidth="516.0" layoutX="-2.0" layoutY="-1.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <Text layoutX="545.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- </children>
- </Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="2">
- <children>
- <ImageView fitHeight="307.0" fitWidth="516.0" layoutX="-2.0" layoutY="-1.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <Text layoutX="545.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- </children>
- </Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
- <children>
- <ImageView fitHeight="307.0" fitWidth="516.0" layoutX="-2.0" layoutY="-1.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <Text layoutX="545.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- </children>
- </Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="3">
- <children>
- <ImageView fitHeight="307.0" fitWidth="516.0" layoutX="-2.0" layoutY="-1.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <Text layoutX="545.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- </children>
- </Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="4">
- <children>
- <ImageView fitHeight="307.0" fitWidth="516.0" layoutX="-2.0" layoutY="-1.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <Text layoutX="545.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- </children>
- </Pane>
- </children>
- </GridPane>
- </center>
- <bottom>
- <Pane prefHeight="150.0" prefWidth="1920.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER">
- <children>
- <HBox alignment="CENTER" layoutY="-2.0" prefHeight="84.0" prefWidth="1920.0" spacing="20.0">
- <children>
- <Button fx:id="footer_previous_page" mnemonicParsing="false" onAction="#switchToPrevious" text="PREVIOUS" />
- <Button fx:id="footer_next_page" layoutX="944.0" layoutY="48.0" mnemonicParsing="false" onAction="#switchToNext" text="NEXT" />
- </children>
- </HBox>
- </children></Pane>
- </bottom>
- </BorderPane>
- </children></AnchorPane>
- </content>
- </ScrollPane>
- </children>
-</AnchorPane>
diff --git a/src/main/resources/NTNU/IDATT1002/search_page_2.fxml b/src/main/resources/NTNU/IDATT1002/search_page_2.fxml
deleted file mode 100644
index e0dbb5c21bc76906897b31295d8ec735128a3460..0000000000000000000000000000000000000000
--- a/src/main/resources/NTNU/IDATT1002/search_page_2.fxml
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.String?>
-<?import javafx.collections.FXCollections?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ChoiceBox?>
-<?import javafx.scene.control.ScrollPane?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
-
-<AnchorPane maxHeight="1080.0" maxWidth="1920.0" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.SearchPageController">
- <children>
- <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
- <children>
- <ImageView fx:id="tbar_logo1" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/PlaceholderLogo.png" />
- </image>
- </ImageView>
- <Pane prefHeight="100.0" prefWidth="561.0" />
- <TextField fx:id="tbar_search1" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_map1" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
- <Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload1" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="40.0" prefWidth="114.0" text="UPLOAD" />
- </children>
- </HBox>
- <ScrollPane fx:id="scrollpane" hbarPolicy="NEVER" layoutY="100.0" prefHeight="980.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="100.0">
- <content>
- <AnchorPane maxHeight="1920.0" minHeight="0.0" minWidth="0.0" prefHeight="2000.0" prefWidth="1920.0">
- <children>
- <BorderPane prefHeight="2000.0" prefWidth="1920.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
- <top>
- <Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER">
- <children>
- <Text fill="WHITE" layoutX="337.0" layoutY="113.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Found">
- <font>
- <Font size="36.0" />
- </font>
- </Text>
- <Text fill="WHITE" layoutX="465.0" layoutY="113.0" strokeType="OUTSIDE" strokeWidth="0.0" text="X">
- <font>
- <Font name="System Bold Italic" size="36.0" />
- </font>
- </Text>
- <Text fill="WHITE" layoutX="513.0" layoutY="113.0" strokeType="OUTSIDE" strokeWidth="0.0" text="results for your search, sorted by:">
- <font>
- <Font size="36.0" />
- </font>
- </Text>
- <ChoiceBox layoutX="1063.0" layoutY="78.0" prefHeight="40.0" prefWidth="166.0" value="Most Popular">
- <items>
- <FXCollections fx:factory="observableArrayList">
- <String fx:value="Most Popular" />
- <String fx:value="Newest First" />
- <String fx:value="Oldest First" />
- </FXCollections>
- </items>
- </ChoiceBox>
- </children></Pane>
- </top>
- <left>
- <Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER" />
- </left>
- <right>
- <Pane prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER" />
- </right>
- <center>
- <GridPane alignment="CENTER" BorderPane.alignment="CENTER">
- <columnConstraints>
- <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
- </columnConstraints>
- <rowConstraints>
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
- </rowConstraints>
- <children>
- <Pane prefHeight="200.0" prefWidth="200.0">
- <children>
- <ImageView fitHeight="307.0" fitWidth="516.0" layoutX="-2.0" layoutY="-1.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <Text layoutX="545.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text=""test "" wrappingWidth="700.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- </children>
- </Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="2">
- <children>
- <ImageView fitHeight="307.0" fitWidth="516.0" layoutX="-2.0" layoutY="-1.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <Text layoutX="545.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- </children>
- </Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1">
- <children>
- <ImageView fitHeight="307.0" fitWidth="516.0" layoutX="-2.0" layoutY="-1.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <Text layoutX="545.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- </children>
- </Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="3">
- <children>
- <ImageView fitHeight="307.0" fitWidth="516.0" layoutX="-2.0" layoutY="-1.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <Text layoutX="545.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- </children>
- </Pane>
- <Pane prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="4">
- <children>
- <ImageView fitHeight="307.0" fitWidth="516.0" layoutX="-2.0" layoutY="-1.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/party.jpg" />
- </image>
- </ImageView>
- <Text layoutX="545.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="551.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="97.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="70.0">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="66.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="153.0">
- <font>
- <Font name="System Bold" size="48.0" />
- </font>
- </Text>
- <Text layoutX="707.0" layoutY="126.0" strokeType="OUTSIDE" strokeWidth="0.0" text="""" wrappingWidth="129.0">
- <font>
- <Font name="System Bold" size="18.0" />
- </font>
- </Text>
- </children>
- </Pane>
- </children>
- </GridPane>
- </center>
- <bottom>
- <Pane prefHeight="150.0" prefWidth="1920.0" style="-fx-background-color: #6d6d6d;" BorderPane.alignment="CENTER">
- <children>
- <HBox alignment="CENTER" layoutY="-2.0" prefHeight="84.0" prefWidth="1920.0" spacing="20.0">
- <children>
- <Button fx:id="footer_previous_page" mnemonicParsing="false" onAction="#switchToPrevious" text="PREVIOUS" />
- <Button fx:id="footer_next_page" layoutX="944.0" layoutY="48.0" mnemonicParsing="false" onAction="#switchToNext" text="NEXT" />
- </children>
- </HBox>
- </children></Pane>
- </bottom>
- </BorderPane>
- </children></AnchorPane>
- </content>
- </ScrollPane>
- </children>
-</AnchorPane>
diff --git a/src/main/resources/NTNU/IDATT1002/signup.fxml b/src/main/resources/NTNU/IDATT1002/signup.fxml
index 7ec82d8e8f4cfb9e69d7abf421748ff1aebccf66..3cb5f6fb31f7ee0c9e2c9838ae2977ed014b0bb8 100644
--- a/src/main/resources/NTNU/IDATT1002/signup.fxml
+++ b/src/main/resources/NTNU/IDATT1002/signup.fxml
@@ -1,42 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.PasswordField?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Text?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
-<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/" fx:controller="NTNU.IDATT1002.controllers.SignUpController">
+
+<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.SignUp">
<children>
- <Label text="Sign Up page" />
- <GridPane hgap="10.0" maxWidth="-Infinity" prefHeight="110.0" prefWidth="300.0" vgap="10.0">
+ <Label text="Sign Up page">
+ <font>
+ <Font size="14.0" />
+ </font></Label>
+ <GridPane fx:id="signup_form" hgap="10.0" maxWidth="-Infinity" prefHeight="229.0" prefWidth="400.0" vgap="10.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="10.0" prefWidth="80.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
+ <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+ <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+ <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+ <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
- <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Username:" GridPane.halignment="RIGHT" />
- <Text strokeType="OUTSIDE" strokeWidth="0.0" text="E-Mail:" GridPane.halignment="RIGHT" GridPane.rowIndex="1" />
- <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Password:" GridPane.halignment="RIGHT" GridPane.rowIndex="2" />
- <TextField GridPane.columnIndex="1" />
- <TextField GridPane.columnIndex="1" GridPane.rowIndex="1" />
- <PasswordField GridPane.columnIndex="1" GridPane.rowIndex="2" />
+ <Text layoutX="37.0" layoutY="110.0" strokeType="OUTSIDE" strokeWidth="0.0" text="First name:" textAlignment="RIGHT" wrappingWidth="59.4921875" GridPane.halignment="RIGHT" />
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Last name:" GridPane.halignment="RIGHT" GridPane.rowIndex="1" />
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Username:" GridPane.halignment="RIGHT" GridPane.rowIndex="2" />
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="E-Mail:" GridPane.halignment="RIGHT" GridPane.rowIndex="3" />
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Password:" GridPane.halignment="RIGHT" GridPane.rowIndex="4" />
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Phone:" GridPane.halignment="RIGHT" GridPane.rowIndex="5" />
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Birth date:" GridPane.halignment="RIGHT" GridPane.rowIndex="6" />
+ <TextField fx:id="signup_firstName" prefHeight="25.0" prefWidth="248.0" GridPane.columnIndex="1" />
+ <TextField fx:id="signup_lastName" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+ <TextField fx:id="signup_username" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+ <TextField fx:id="signup_email" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+ <PasswordField fx:id="signup_password" prefWidth="247.0" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+ <HBox GridPane.columnIndex="1" GridPane.rowIndex="5">
+ <children>
+ <TextField fx:id="signup_phoneCode" prefHeight="25.0" prefWidth="150.0" promptText="Calling code" />
+ <TextField fx:id="signup_phoneNr" prefWidth="242.0" promptText="Phone number" />
+ </children>
+ </HBox>
+ <DatePicker fx:id="signup_birthDate" prefHeight="25.0" prefWidth="304.0" GridPane.columnIndex="1" GridPane.rowIndex="6" />
</children>
<padding>
<Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
</padding>
</GridPane>
- <Button fx:id="secondaryButton" onAction="#switchToPrimary" text="Sign up" />
+ <HBox alignment="CENTER" spacing="10.0">
+ <children>
+ <Button fx:id="cancelBtn" layoutX="10.0" layoutY="10.0" onAction="#cancel" prefHeight="26.0" prefWidth="85.0" text="Cancel" />
+ <Text fx:id="signup_error" strokeType="OUTSIDE" strokeWidth="0.0" wrappingWidth="170.13671875" />
+ <Button fx:id="signup_btn" onAction="#signup" prefHeight="26.0" prefWidth="85.0" text="Sign up" />
+ </children>
+ </HBox>
+
</children>
<padding>
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
diff --git a/src/main/resources/NTNU/IDATT1002/style.css b/src/main/resources/NTNU/IDATT1002/style.css
new file mode 100644
index 0000000000000000000000000000000000000000..aa2d21cf77f47fb8e2957c3d735ca0b98db02355
--- /dev/null
+++ b/src/main/resources/NTNU/IDATT1002/style.css
@@ -0,0 +1,23 @@
+
+.bodybg{
+ -fx-background-image: url("../../Images/vector1.jpg");
+ -fx-background-size: cover;
+}
+
+.signupbg{
+ -fx-background-color: #10101f;
+}
+
+.button{
+ -fx-transition-duration: 0.4s;
+ -fx-background-color: blank;
+ -fx-border-width: 2px;
+ -fx-border-color: white;
+ -fx-color: white;
+
+}
+
+.button:hover{
+ -fx-background-color: rgba(193, 198, 196, 0.5);
+ -fx-color: white;
+}
\ No newline at end of file
diff --git a/src/main/resources/NTNU/IDATT1002/upload.fxml b/src/main/resources/NTNU/IDATT1002/upload.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..829d5ee5499d8334fa7f0a8885eb907abe33441d
--- /dev/null
+++ b/src/main/resources/NTNU/IDATT1002/upload.fxml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.Upload">
+<children>
+ <VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+ <children>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
+ <HBox alignment="CENTER" prefHeight="883.0" prefWidth="1791.0">
+ <children>
+ <VBox alignment="CENTER" prefHeight="883.0" prefWidth="641.0">
+ <children>
+ <Pane fx:id="drag_drop" maxHeight="-Infinity" maxWidth="-Infinity" onDragDropped="#droppedFiles" onDragOver="#acceptDrop" prefHeight="190.0" prefWidth="397.0" style="-fx-background-color: lightgrey; -fx-border-color: grey;">
+ <children>
+ <Text layoutX="94.0" layoutY="104.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Drag and drop files" wrappingWidth="209.3367156982422">
+ <font>
+ <Font size="24.0" />
+ </font>
+ </Text>
+ </children>
+ </Pane>
+ <Button fx:id="uploadBtn" alignment="CENTER" contentDisplay="CENTER" mnemonicParsing="false" onMouseClicked="#chooseFile" prefHeight="30.0" prefWidth="187.0" text="Choose files">
+ <font>
+ <Font size="18.0" />
+ </font></Button>
+ </children>
+ </VBox>
+ </children>
+ </HBox>
+ </children>
+ </VBox>
+</children>
+</AnchorPane>
diff --git a/src/main/resources/NTNU/IDATT1002/upload_page.fxml b/src/main/resources/NTNU/IDATT1002/upload_page.fxml
deleted file mode 100644
index 835a3037e2c9ffa30cf7be03d1eb54e19958e66c..0000000000000000000000000000000000000000
--- a/src/main/resources/NTNU/IDATT1002/upload_page.fxml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
-
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.UploadController">
-<top>
- <HBox prefHeight="71.0" prefWidth="600.0" style="-fx-background-color: #7b7b7b;" BorderPane.alignment="CENTER">
- <children>
- <HBox alignment="CENTER" prefHeight="135.0" prefWidth="404.0">
- <children>
- <Pane onMouseClicked="#switchToExplore" prefHeight="71.0" prefWidth="100.0">
- <children>
- <Text layoutX="21.0" layoutY="42.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Explore">
- <font>
- <Font size="18.0" />
- </font>
- </Text>
- </children>
- </Pane>
- <Pane onMouseClicked="#switchToAlbum" prefHeight="71.0" prefWidth="100.0">
- <children>
- <Text layoutX="24.0" layoutY="42.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Album">
- <font>
- <Font size="18.0" />
- </font>
- </Text>
- </children>
- </Pane>
- <Pane onMouseClicked="#switchToMap" prefHeight="71.0" prefWidth="100.0">
- <children>
- <Text layoutX="32.0" layoutY="42.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Map">
- <font>
- <Font size="18.0" />
- </font>
- </Text>
- </children>
- </Pane>
- <Pane prefHeight="71.0" prefWidth="100.0" style="-fx-background-color: #d6d6d6;">
- <children>
- <Text layoutX="18.0" layoutY="43.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Upload" wrappingWidth="63.408203125">
- <font>
- <Font size="18.0" />
- </font>
- </Text>
- </children>
- </Pane>
- </children>
- </HBox>
- <HBox alignment="CENTER" prefHeight="74.0" prefWidth="200.0">
- <children>
- <TextField fx:id="searchField" focusTraversable="false" onKeyTyped="#search" prefHeight="26.0" prefWidth="133.0" promptText="Search" />
- </children>
- </HBox>
- </children>
- <BorderPane.margin>
- <Insets />
- </BorderPane.margin>
- </HBox>
-</top>
-<left>
- <Pane prefHeight="282.0" prefWidth="71.0" style="-fx-background-color: #b8b8b8;" BorderPane.alignment="CENTER" />
-</left>
-<center>
- <Pane prefHeight="212.0" prefWidth="338.0" snapToPixel="false" style="-fx-background-color: #d6d6d6;" BorderPane.alignment="BOTTOM_RIGHT">
- <children>
- <Button fx:id="uploadBtn" alignment="CENTER" contentDisplay="CENTER" layoutX="159.0" layoutY="181.0" mnemonicParsing="false" onMouseClicked="#chooseFile" prefHeight="25.0" prefWidth="152.0" text="Choose files" />
- <Pane fx:id="dragDropField" layoutX="111.0" layoutY="58.0" onDragDropped="#droppedFiles" onDragOver="#acceptDrop" prefHeight="106.0" prefWidth="248.0" style="-fx-background-color: lightgrey; -fx-border-color: grey;">
- <children>
- <Text layoutX="61.0" layoutY="58.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Drag and drop files" wrappingWidth="125.33671569824219">
- <font>
- <Font size="14.0" />
- </font>
- </Text>
- </children>
- <cursor>
- <Cursor fx:constant="DEFAULT" />
- </cursor>
- </Pane>
- </children>
- </Pane>
-</center>
-<right>
- <Pane prefHeight="282.0" prefWidth="58.0" style="-fx-background-color: #a5a5a5;" BorderPane.alignment="CENTER">
- <children>
- <VBox fx:id="thumbnailsField" layoutX="1.0" layoutY="14.0" prefHeight="200.0" prefWidth="58.0" />
- </children></Pane>
-</right>
-<bottom>
- <Pane prefHeight="47.0" prefWidth="600.0" style="-fx-background-color: #727272;" BorderPane.alignment="CENTER" />
-</bottom>
-</BorderPane>
-
diff --git a/src/main/resources/NTNU/IDATT1002/uploaded_album.fxml b/src/main/resources/NTNU/IDATT1002/uploaded_multiple.fxml
similarity index 70%
rename from src/main/resources/NTNU/IDATT1002/uploaded_album.fxml
rename to src/main/resources/NTNU/IDATT1002/uploaded_multiple.fxml
index e328a87532c5d6b3c8987da90fe9f30434d3f3ea..34a3c5d0a53b607afc7a021cd3225ca3128f8c80 100644
--- a/src/main/resources/NTNU/IDATT1002/uploaded_album.fxml
+++ b/src/main/resources/NTNU/IDATT1002/uploaded_multiple.fxml
@@ -13,28 +13,30 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
-<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.UploadedAlbumController">
+<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.controllers.UploadedMultiple">
<children>
<VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<children>
- <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="200.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
- <children>
- <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/PlaceholderLogo.png" />
- </image>
- </ImageView>
- <Pane prefHeight="100.0" prefWidth="343.0" />
- <TextField fx:id="tbar_search" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
- <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
- <Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
- </children>
- </HBox>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
<HBox alignment="CENTER" prefHeight="982.0" prefWidth="1920.0">
<children>
- <ScrollPane prefHeight="1080.0" prefWidth="1920.0">
+ <ScrollPane hbarPolicy="NEVER" prefHeight="1080.0" prefWidth="1920.0" HBox.hgrow="ALWAYS">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="2100.0" prefWidth="1920.0" style="-fx-background-color: #999999;">
<children>
@@ -45,19 +47,19 @@
<Font name="System Bold" size="36.0" />
</font>
</Text>
- <TextField fx:id="album_title_field" layoutX="486.0" layoutY="110.0" prefHeight="40.0" prefWidth="488.0" promptText="Insert title here" />
+ <TextField layoutX="486.0" layoutY="110.0" prefHeight="40.0" prefWidth="488.0" promptText="Insert title here" />
<Text layoutX="238.0" layoutY="182.0" strokeType="OUTSIDE" strokeWidth="0.0" text="ALBUMTAGS:">
<font>
<Font name="System Bold" size="24.0" />
</font>
</Text>
- <TextField fx:id="album_tag_field" layoutX="411.0" layoutY="157.0" prefHeight="32.0" prefWidth="564.0" promptText="#Blue, #water, #summer, etc..." />
+ <TextField layoutX="411.0" layoutY="157.0" prefHeight="32.0" prefWidth="564.0" promptText="#Blue, #water, #summer, etc..." />
<Text layoutX="239.0" layoutY="224.0" strokeType="OUTSIDE" strokeWidth="0.0" text="ALBUMDESCRIPTION:">
<font>
<Font name="System Bold" size="24.0" />
</font>
</Text>
- <TextArea fx:id="album_desc_field" layoutX="238.0" layoutY="239.0" prefHeight="140.0" prefWidth="739.0" promptText="Insert description here" />
+ <TextArea layoutX="238.0" layoutY="239.0" prefHeight="140.0" prefWidth="739.0" promptText="Insert description here" />
<Text layoutX="1002.0" layoutY="138.0" strokeType="OUTSIDE" strokeWidth="0.0" text="INCLUDED METADATA:">
<font>
<Font name="System Bold" size="24.0" />
@@ -84,10 +86,10 @@
<Font name="System Bold" size="24.0" />
</font>
</Text>
- <TextField fx:id="title_field" layoutX="1002.0" layoutY="552.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
- <TextField fx:id="tag_field" layoutX="963.0" layoutY="630.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
- <TextArea fx:id="desc_field" layoutX="872.0" layoutY="734.0" prefHeight="140.0" prefWidth="822.0" promptText="Insert description here" />
- <ImageView fx:id="uploaded_image" fitHeight="325.0" fitWidth="608.0" layoutX="238.0" layoutY="549.0" pickOnBounds="true" preserveRatio="true">
+ <TextField fx:id="photo_title" layoutX="1002.0" layoutY="552.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
+ <TextField fx:id="photo_tag" layoutX="963.0" layoutY="630.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
+ <TextArea fx:id="photo_desc" layoutX="872.0" layoutY="734.0" prefHeight="140.0" prefWidth="822.0" promptText="Insert description here" />
+ <ImageView fx:id="photo_image" fitHeight="325.0" fitWidth="608.0" layoutX="238.0" layoutY="549.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../../Images/placeholder-1920x1080.png" /> <!-- This is the URL to the image in question, needs to change in accordance with the current uploaded picture-->
</image>
@@ -108,10 +110,10 @@
<Font name="System Bold" size="24.0" />
</font>
</Text>
- <TextField fx:id="title_field2" layoutX="1002.0" layoutY="914.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
- <TextField fx:id="tag_field2" layoutX="963.0" layoutY="992.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
- <TextArea fx:id="desc_field2" layoutX="872.0" layoutY="1096.0" prefHeight="140.0" prefWidth="822.0" promptText="Insert description here" />
- <ImageView fx:id="uploaded_image1" fitHeight="325.0" fitWidth="608.0" layoutX="238.0" layoutY="911.0" pickOnBounds="true" preserveRatio="true">
+ <TextField fx:id="photo_title2" layoutX="1002.0" layoutY="914.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
+ <TextField fx:id="photo_tag2" layoutX="963.0" layoutY="992.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
+ <TextArea fx:id="photo_desc2" layoutX="872.0" layoutY="1096.0" prefHeight="140.0" prefWidth="822.0" promptText="Insert description here" />
+ <ImageView fx:id="photo_image2" fitHeight="325.0" fitWidth="608.0" layoutX="238.0" layoutY="911.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../../Images/placeholder-1920x1080.png" />
</image>
@@ -132,10 +134,10 @@
<Font name="System Bold" size="24.0" />
</font>
</Text>
- <TextField fx:id="title_field3" layoutX="1002.0" layoutY="1276.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
- <TextField fx:id="tag_field3" layoutX="963.0" layoutY="1354.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
- <TextArea fx:id="desc_field3" layoutX="872.0" layoutY="1458.0" prefHeight="140.0" prefWidth="822.0" promptText="Insert description here" />
- <ImageView fx:id="uploaded_image2" fitHeight="325.0" fitWidth="608.0" layoutX="238.0" layoutY="1273.0" pickOnBounds="true" preserveRatio="true">
+ <TextField fx:id="photo_title3" layoutX="1002.0" layoutY="1276.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
+ <TextField fx:id="photo_tag3" layoutX="963.0" layoutY="1354.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
+ <TextArea fx:id="photo_desc3" layoutX="872.0" layoutY="1458.0" prefHeight="140.0" prefWidth="822.0" promptText="Insert description here" />
+ <ImageView fx:id="photo_image3" fitHeight="325.0" fitWidth="608.0" layoutX="238.0" layoutY="1273.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../../Images/placeholder-1920x1080.png" /> <!-- This is the URL to the image in question, needs to change in accordance with the current uploaded picture-->
</image>
@@ -156,15 +158,15 @@
<Font name="System Bold" size="24.0" />
</font>
</Text>
- <TextField fx:id="title_field4" layoutX="1002.0" layoutY="1638.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
- <TextField fx:id="tag_field4" layoutX="963.0" layoutY="1716.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
- <TextArea fx:id="desc_field4" layoutX="872.0" layoutY="1820.0" prefHeight="140.0" prefWidth="822.0" promptText="Insert description here" />
- <ImageView fx:id="uploaded_image3" fitHeight="325.0" fitWidth="608.0" layoutX="238.0" layoutY="1635.0" pickOnBounds="true" preserveRatio="true">
+ <TextField fx:id="photo_title4" layoutX="1002.0" layoutY="1638.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
+ <TextField fx:id="photo_tag4" layoutX="963.0" layoutY="1716.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
+ <TextArea fx:id="photo_desc4" layoutX="872.0" layoutY="1820.0" prefHeight="140.0" prefWidth="822.0" promptText="Insert description here" />
+ <ImageView fx:id="photo_image4" fitHeight="325.0" fitWidth="608.0" layoutX="238.0" layoutY="1635.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../../Images/placeholder-1920x1080.png" />
</image>
</ImageView>
- <Button fx:id="accept_button" layoutX="880.0" layoutY="2000.0" mnemonicParsing="false" onAction="#uploadAlbum" text="ACCEPT">
+ <Button fx:id="acceptBtn" layoutX="880.0" layoutY="2000.0" mnemonicParsing="false" onAction="#uploadMultiple" text="ACCEPT">
<font>
<Font name="System Bold" size="24.0" />
</font>
diff --git a/src/main/resources/NTNU/IDATT1002/uploaded_photo.fxml b/src/main/resources/NTNU/IDATT1002/uploaded_photo.fxml
deleted file mode 100644
index 84aef0b67789691ee94220211f5bf38921f3aae4..0000000000000000000000000000000000000000
--- a/src/main/resources/NTNU/IDATT1002/uploaded_photo.fxml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Pane?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
-
-<AnchorPane prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.UploadedPhotoController">
- <children>
- <VBox prefHeight="1080.0" prefWidth="1920.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
- <children>
- <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="200.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
- <children>
- <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/PlaceholderLogo.png" />
- </image>
- </ImageView>
- <Pane prefHeight="100.0" prefWidth="343.0" />
- <TextField fx:id="tbar_search" onAction="#switchToSearch" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
- <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
- <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
- <Pane prefHeight="100.0" prefWidth="174.0" />
- <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
- </children>
- </HBox>
- <HBox alignment="CENTER" prefHeight="982.0" prefWidth="1920.0">
- <children>
- <Pane prefHeight="981.0" prefWidth="851.0" style="-fx-background-color: #777777;">
- <children>
- <ImageView fx:id="uploaded_image" fitHeight="455.0" fitWidth="952.0" layoutX="19.0" layoutY="263.0" pickOnBounds="true" preserveRatio="true">
- <image>
- <Image url="@../../Images/placeholder-1920x1080.png" /> <!-- This is the URL to the image in question, needs to change in accordance with the current uploaded picture-->
- </image>
- </ImageView>
- </children>
- </Pane>
- <Pane prefHeight="981.0" prefWidth="1073.0" style="-fx-background-color: #999999;">
- <children>
- <Text layoutX="127.0" layoutY="112.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:">
- <font>
- <Font name="System Bold" size="36.0" />
- </font>
- </Text>
- <Text layoutX="127.0" layoutY="186.0" strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="127.0" layoutY="250.0" strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <Text layoutX="125.0" layoutY="456.0" strokeType="OUTSIDE" strokeWidth="0.0" text="METADATA:">
- <font>
- <Font name="System Bold" size="24.0" />
- </font>
- </Text>
- <TextField fx:id="title_field" layoutX="256.0" layoutY="83.0" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
- <TextField fx:id="tag_field" layoutX="217.0" layoutY="161.0" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
- <TextArea fx:id="desc_field" layoutX="126.0" layoutY="265.0" prefHeight="147.0" prefWidth="822.0" promptText="Insert description here" />
- <Pane layoutX="125.0" layoutY="470.0" prefHeight="364.0" prefWidth="822.0" style="-fx-background-color: #ffffff;">
- <children>
- <Text layoutX="218.0" layoutY="196.0" strokeType="OUTSIDE" strokeWidth="0.0" text="NOT YET IMPLEMENTED">
- <font>
- <Font size="36.0" />
- </font>
- </Text>
- </children>
- </Pane>
- <Button fx:id="accept_button" layoutX="493.0" layoutY="870.0" mnemonicParsing="false" onAction="#uploadPhoto" text="ACCEPT">
- <font>
- <Font size="18.0" />
- </font>
- </Button>
- </children>
- </Pane>
- </children>
- </HBox>
- </children>
- </VBox>
- </children>
-</AnchorPane>
diff --git a/src/main/resources/NTNU/IDATT1002/uploaded_single.fxml b/src/main/resources/NTNU/IDATT1002/uploaded_single.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..b325c316465231b7dd2cf7a087e7287d385a07a6
--- /dev/null
+++ b/src/main/resources/NTNU/IDATT1002/uploaded_single.fxml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+
+<VBox alignment="CENTER" prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.UploadedSingle">
+ <children>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
+ <HBox alignment="CENTER" prefHeight="982.0" prefWidth="1920.0" VBox.vgrow="ALWAYS">
+ <children>
+ <VBox alignment="CENTER" prefHeight="981.0" prefWidth="976.0" style="-fx-background-color: #444444;" HBox.hgrow="ALWAYS">
+ <children>
+ <ImageView fx:id="photo_image" fitHeight="506.0" fitWidth="900.0" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/placeholder-1920x1080.png" />
+ </image>
+ </ImageView>
+ </children>
+ </VBox>
+ <VBox alignment="CENTER" prefHeight="981.0" prefWidth="947.0" style="-fx-background-color: #666666;" HBox.hgrow="ALWAYS">
+ <children>
+ <VBox alignment="CENTER" maxWidth="799.0" prefHeight="981.0" prefWidth="799.0" spacing="10.0">
+ <children>
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="TITLE:">
+ <font>
+ <Font name="System Bold" size="36.0" />
+ </font>
+ </Text>
+ <TextField fx:id="photo_title" prefHeight="32.0" prefWidth="689.0" promptText="Insert title here" />
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="TAGS:">
+ <font>
+ <Font name="System Bold" size="24.0" />
+ </font>
+ </Text>
+ <TextField fx:id="photo_tag" prefHeight="32.0" prefWidth="728.0" promptText="#Blue, #water, #summer, etc..." />
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:">
+ <font>
+ <Font name="System Bold" size="24.0" />
+ </font>
+ </Text>
+ <TextArea fx:id="photo_desc" prefHeight="147.0" prefWidth="822.0" promptText="Insert description here" />
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="METADATA:">
+ <font>
+ <Font name="System Bold" size="24.0" />
+ </font>
+ </Text>
+ <Pane prefHeight="364.0" prefWidth="822.0" style="-fx-background-color: #ffffff;" />
+ <Button fx:id="acceptBtn" mnemonicParsing="false" onAction="#uploadSingle" text="ACCEPT">
+ <font>
+ <Font size="18.0" />
+ </font>
+ </Button>
+ </children>
+ </VBox>
+ </children>
+ </VBox>
+ </children>
+ </HBox>
+ </children>
+</VBox>
diff --git a/src/main/resources/NTNU/IDATT1002/view_album.fxml b/src/main/resources/NTNU/IDATT1002/view_album.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..7185aaf2485612033bd196216c972c3597e5c1db
--- /dev/null
+++ b/src/main/resources/NTNU/IDATT1002/view_album.fxml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+
+<VBox prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.ViewAlbum">
+ <children>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
+ <HBox alignment="CENTER" prefHeight="982.0" prefWidth="1920.0" VBox.vgrow="ALWAYS">
+ <children>
+ <VBox prefHeight="200.0" prefWidth="35.0" HBox.hgrow="ALWAYS" />
+ <VBox alignment="CENTER" prefHeight="981.0" prefWidth="1050.0">
+ <children>
+ <VBox maxWidth="839.0" prefHeight="660.0" prefWidth="839.0" spacing="10.0">
+ <children>
+ <Text fx:id="pictureTitleField" strokeType="OUTSIDE" strokeWidth="0.0" text="Picturetitle">
+ <font>
+ <Font size="24.0" />
+ </font>
+ </Text>
+ <Text fx:id="pictureTagsField" strokeType="OUTSIDE" strokeWidth="0.0" text="#tags">
+ <font>
+ <Font size="18.0" />
+ </font>
+ </Text>
+ <ImageView fx:id="mainPicture" fitHeight="472.0" fitWidth="839.0" onMouseClicked="#openPopUpPicture" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/placeholder-1920x1080.png" />
+ </image>
+ </ImageView>
+ <ScrollPane hbarPolicy="ALWAYS" maxHeight="100.0" prefHeight="110.0" prefWidth="839.0" vbarPolicy="NEVER" vmax="0.0" vvalue="1.0" VBox.vgrow="NEVER">
+ <content>
+ <HBox fx:id="albumImages" alignment="CENTER" maxHeight="100.0" prefHeight="85.0" prefWidth="858.0" spacing="10.0">
+ </HBox>
+ </content>
+ </ScrollPane>
+ </children>
+ </VBox>
+ </children>
+ </VBox>
+ <VBox alignment="CENTER" prefHeight="981.0" prefWidth="800.0">
+ <children>
+ <VBox fx:id="albumTextContainer" maxWidth="700.0" prefWidth="700.0">
+ <children>
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" wrappingWidth="79.44140625" />
+ </children>
+ </VBox>
+ <VBox maxWidth="700.0" spacing="20.0">
+ <children>
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="PICTURE METADATA:">
+ <font>
+ <Font name="System Bold" size="24.0" />
+ </font>
+ </Text>
+ <Pane fx:id="metadataPane" prefHeight="304.0" prefWidth="700.0" style="-fx-background-color: #ffffff;" />
+ <Button fx:id="createAlbumPdf" mnemonicParsing="false" onAction="#createPdf" text="CREATE ALBUM PDF">
+ <font>
+ <Font size="18.0" />
+ </font>
+ </Button>
+ </children>
+ </VBox>
+ </children>
+ </VBox>
+ <VBox prefHeight="200.0" prefWidth="35.0" HBox.hgrow="ALWAYS" />
+ </children>
+ </HBox>
+ </children>
+</VBox>
diff --git a/src/main/resources/NTNU/IDATT1002/view_picture.fxml b/src/main/resources/NTNU/IDATT1002/view_picture.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..2426c052f36d0e18691d0d70532b20507f49ee2c
--- /dev/null
+++ b/src/main/resources/NTNU/IDATT1002/view_picture.fxml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
+
+<VBox prefHeight="1080.0" prefWidth="1920.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.controllers.ViewPicture">
+ <children>
+ <HBox alignment="CENTER" minHeight="100.0" prefHeight="100.0" prefWidth="1920.0" spacing="20.0" style="-fx-background-color: #0c0c0c;">
+ <children>
+ <ImageView fx:id="tbar_logo" fitHeight="69.0" fitWidth="153.0" onMouseClicked="#switchToMain" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/PlaceholderLogo.png" />
+ </image>
+ </ImageView>
+ <Pane prefHeight="100.0" prefWidth="343.0" />
+ <TextField fx:id="tbar_search" prefHeight="25.0" prefWidth="358.0" promptText="Search: Tags, Albums, Metadata, etc..." />
+ <Button fx:id="tbar_searchBtn" mnemonicParsing="false" onAction="#switchToSearch" text="SEARCH" />
+ <Button fx:id="tbar_explore" mnemonicParsing="false" onAction="#switchToExplore" text="EXPLORE" />
+ <Button fx:id="tbar_albums" mnemonicParsing="false" onAction="#switchToAlbums" text="ALBUMS" />
+ <Button fx:id="tbar_map" mnemonicParsing="false" onAction="#switchToMap" text="MAP" />
+ <Pane prefHeight="100.0" prefWidth="174.0" />
+ <Button fx:id="tbar_upload" mnemonicParsing="false" onAction="#switchToUpload" prefHeight="25.0" prefWidth="114.0" text="UPLOAD" />
+ </children>
+ </HBox>
+ <HBox alignment="CENTER" VBox.vgrow="ALWAYS">
+ <children>
+ <VBox alignment="CENTER" prefHeight="981.0" prefWidth="1066.0" style="-fx-background-color: #777777;">
+ <children>
+ <VBox alignment="CENTER_LEFT" maxHeight="981.0" maxWidth="966.0" style="-fx-background-color: #777777;">
+ <children>
+ <Text fx:id="picture_title_field" strokeType="OUTSIDE" strokeWidth="0.0" text="Picturetitle" textAlignment="CENTER">
+ <font>
+ <Font name="System Bold Italic" size="36.0" />
+ </font>
+ </Text>
+ <ImageView fx:id="picture" fitHeight="543.0" fitWidth="969.0" onMouseClicked="#openPopUpPicture" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/placeholder-1920x1080.png" />
+ </image>
+ </ImageView>
+ <Text fx:id="picture_tagsField" strokeType="OUTSIDE" strokeWidth="0.0" text="#tags">
+ <font>
+ <Font size="18.0" />
+ </font>
+ </Text>
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="DESCRIPTION:" wrappingWidth="164.24609375">
+ <font>
+ <Font name="System Bold" size="24.0" />
+ </font>
+ </Text>
+ <Text fx:id="picture_descField" strokeType="OUTSIDE" strokeWidth="0.0" text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." wrappingWidth="700.0">
+ <font>
+ <Font size="14.0" />
+ </font>
+ </Text>
+ </children>
+ </VBox>
+ </children>
+ </VBox>
+ <VBox alignment="CENTER" prefHeight="981.0" prefWidth="791.0" spacing="20.0" style="-fx-background-color: #666666;" HBox.hgrow="ALWAYS">
+ <children>
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="PICTURE METADATA:">
+ <font>
+ <Font name="System Bold" size="24.0" />
+ </font>
+ </Text>
+ <Pane fx:id="metadata_pane" prefHeight="740.0" prefWidth="779.0" style="-fx-background-color: #ffffff;" />
+ </children>
+ </VBox>
+ </children>
+ </HBox>
+ </children>
+</VBox>
diff --git a/src/main/resources/hibernate.properties b/src/main/resources/hibernate.properties
new file mode 100644
index 0000000000000000000000000000000000000000..1c3c5a0e157d86a48cb83f91363d52030ca119a5
--- /dev/null
+++ b/src/main/resources/hibernate.properties
@@ -0,0 +1,10 @@
+# Set this value to true if you want to configure another connection
+OVERRIDE_DEFAULT_DB_CONFIG=false
+
+# These values correspond to database hosted on https://www.digitalocean.com/
+DB_DRIVER=com.mysql.cj.jdbc.Driver
+DB_URL=jdbc:mysql://db-mysql-lon1-07155-do-user-7212587-0.a.db.ondigitalocean.com:25060/image_application
+DB_USER=doadmin
+DB_PASSWORD=s4oxtqu20e8r7tx5
+DB_DIALECT=org.hibernate.dialect.MySQL8Dialect
+DB_HBM2DDL=update
\ No newline at end of file
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
new file mode 100644
index 0000000000000000000000000000000000000000..f45db84340e0458b08c7bafb5d8bc369d6d6954b
--- /dev/null
+++ b/src/main/resources/log4j.properties
@@ -0,0 +1,14 @@
+# Direct to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+
+# Root logger option
+log4j.rootLogger=INFO, stdout
+
+# Good for troubleshooting
+log4j.logger.org.hibernate=INFO
+
+# Log JDBC parameters
+log4j.logger.org.hibernate.type=ALL
diff --git a/src/test/java/NTNU/IDATT1002/repository/ImageAlbumRepositoryTest.java b/src/test/java/NTNU/IDATT1002/repository/ImageAlbumRepositoryTest.java
index f8ba07fbf0d0fe425270a3008b2a147931a4e57e..240be1063080a951dbf4c3a2128220957187115a 100644
--- a/src/test/java/NTNU/IDATT1002/repository/ImageAlbumRepositoryTest.java
+++ b/src/test/java/NTNU/IDATT1002/repository/ImageAlbumRepositoryTest.java
@@ -1,6 +1,7 @@
package NTNU.IDATT1002.repository;
-import NTNU.IDATT1002.models.ImageAlbum;
+import NTNU.IDATT1002.models.Album;
+import NTNU.IDATT1002.models.User;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -10,32 +11,41 @@ import javax.persistence.Persistence;
import java.util.List;
import java.util.Optional;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
- * Tests for {@link ImageAlbumRepository}.
+ * Tests for {@link AlbumRepository}.
*
* @author Eirik Steira
* @version 1.0 17.03.20
*/
-class ImageAlbumRepositoryTest {
+class AlbumRepositoryTest {
private static final String IMAGE_ALBUM_TITLE = "Test";
private static final Long IMAGE_ALBUM_INITIAL_ID = 1L;
- private ImageAlbumRepository imageAlbumRepository;
+ private AlbumRepository albumRepository;
+ private UserRepository userRepository;
+
+ private User currentUser;
/**
- * Setup test data - An {@link EntityManager} and an {@link ImageAlbumRepository}.
+ * Setup test data - An {@link EntityManager} and an {@link AlbumRepository}.
*/
@BeforeEach
public void setUp() {
EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory("ImageApplicationTest");
EntityManager entityManager = entityManagerFactory.createEntityManager();
- imageAlbumRepository = new ImageAlbumRepository(entityManager);
+ albumRepository = new AlbumRepository(entityManager);
+ userRepository = new UserRepository(entityManager);
+
+ currentUser = new User();
+ currentUser.setUsername("testUser");
+ userRepository.save(currentUser);
}
/**
@@ -43,9 +53,9 @@ class ImageAlbumRepositoryTest {
*/
@Test
void testSaveReturnsInstance() {
- Optional<ImageAlbum> savedImageAlbum = imageAlbumRepository.save(new ImageAlbum());
+ Optional<Album> savedAlbum = albumRepository.save(new Album());
- assertTrue(savedImageAlbum.isPresent());
+ assertTrue(savedAlbum.isPresent());
}
/**
@@ -53,9 +63,9 @@ class ImageAlbumRepositoryTest {
*/
@Test
void testSaveInvalidEntityReturnsEmptyOptional() {
- Optional<ImageAlbum> savedImageAlbum = imageAlbumRepository.save(null);
+ Optional<Album> savedAlbum = albumRepository.save(null);
- assertTrue(savedImageAlbum.isEmpty());
+ assertTrue(savedAlbum.isEmpty());
}
/**
@@ -63,12 +73,11 @@ class ImageAlbumRepositoryTest {
*/
@Test
void testFindAllReturnsAllSavedEntities() {
- imageAlbumRepository.save(new ImageAlbum());
- imageAlbumRepository.save(new ImageAlbum());
-
- List<?> foundImageAlbums = imageAlbumRepository.findAll();
+ albumRepository.save(new Album());
+ albumRepository.save(new Album());
- assertEquals(2, foundImageAlbums.size());
+ List<?> foundAlbums = albumRepository.findAll();
+ assertEquals(2, foundAlbums.size());
}
/**
@@ -76,59 +85,26 @@ class ImageAlbumRepositoryTest {
*/
@Test
void testFindByIdReturnsOptionalWithEntityWithId() {
- imageAlbumRepository.save(new ImageAlbum());
- Optional<ImageAlbum> foundImageAlbum = imageAlbumRepository.findById(IMAGE_ALBUM_INITIAL_ID);
+ albumRepository.save(new Album());
+ Optional<Album> foundAlbum = albumRepository.findById(IMAGE_ALBUM_INITIAL_ID);
- assertTrue(foundImageAlbum.isPresent());
- assertEquals(IMAGE_ALBUM_INITIAL_ID, foundImageAlbum.get().getId());
+ assertTrue(foundAlbum.isPresent());
+ assertEquals(IMAGE_ALBUM_INITIAL_ID, foundAlbum.get().getId());
}
- /**
- * Test that finding all entities by title with a single match returns a list with only that instance.
- */
- @Test
- void testFindAllByTitleWithSingleMatchReturnsListWithSingleInstance() {
- ImageAlbum imageAlbum = new ImageAlbum();
- imageAlbum.setTitle(IMAGE_ALBUM_TITLE);
-
- Optional<ImageAlbum> savedImageAlbum = imageAlbumRepository.save(imageAlbum);
- List<?> foundImageAlbums = imageAlbumRepository.findAllByTitle(IMAGE_ALBUM_TITLE);
-
- assertEquals(1, foundImageAlbums.size());
- assertEquals(savedImageAlbum.get(), foundImageAlbums.get(0));
- }
-
- /**
- * Test that finding all entities by title with multiple matches returns a list with all matching instances.
- */
- @Test
- void testFindAllByTitleWithMultipleMatchesReturnsListWithInstances() {
- ImageAlbum imageAlbum = new ImageAlbum();
- imageAlbum.setTitle(IMAGE_ALBUM_TITLE);
-
- imageAlbumRepository.save(imageAlbum);
-
- imageAlbum = new ImageAlbum();
- imageAlbum.setTitle(IMAGE_ALBUM_TITLE + "Test");
-
- imageAlbumRepository.save(imageAlbum);
- List<?> foundImageAlbums = imageAlbumRepository.findAllByTitle(IMAGE_ALBUM_TITLE);
-
- assertEquals(2, foundImageAlbums.size());
- }
/**
* Test that deleting an entity by id removes said entity.
*/
@Test
void testDeleteByIdRemovesEntity() {
- imageAlbumRepository.save(new ImageAlbum());
- Optional<ImageAlbum> foundImageAlbum = imageAlbumRepository.findById(IMAGE_ALBUM_INITIAL_ID);
+ albumRepository.save(new Album());
+ Optional<Album> foundAlbum = albumRepository.findById(IMAGE_ALBUM_INITIAL_ID);
- foundImageAlbum.ifPresent(imageAlbum -> imageAlbumRepository.deleteById(IMAGE_ALBUM_INITIAL_ID));
- Optional<ImageAlbum> deletedImageAlbum = imageAlbumRepository.findById(IMAGE_ALBUM_INITIAL_ID);
+ foundAlbum.ifPresent(album -> albumRepository.deleteById(IMAGE_ALBUM_INITIAL_ID));
+ Optional<Album> deletedAlbum = albumRepository.findById(IMAGE_ALBUM_INITIAL_ID);
- assertTrue(deletedImageAlbum.isEmpty());
+ assertTrue(deletedAlbum.isEmpty());
}
/**
@@ -136,13 +112,13 @@ class ImageAlbumRepositoryTest {
*/
@Test
void testDeleteRemovesEntity() {
- imageAlbumRepository.save(new ImageAlbum());
- Optional<ImageAlbum> foundImageAlbum = imageAlbumRepository.findById(IMAGE_ALBUM_INITIAL_ID);
+ albumRepository.save(new Album());
+ Optional<Album> foundAlbum = albumRepository.findById(IMAGE_ALBUM_INITIAL_ID);
- foundImageAlbum.ifPresent(imageAlbumRepository::delete);
- Optional<ImageAlbum> deletedImageAlbum = imageAlbumRepository.findById(IMAGE_ALBUM_INITIAL_ID);
+ foundAlbum.ifPresent(albumRepository::delete);
+ Optional<Album> deletedAlbum = albumRepository.findById(IMAGE_ALBUM_INITIAL_ID);
- assertTrue(deletedImageAlbum.isEmpty());
+ assertTrue(deletedAlbum.isEmpty());
}
/**
@@ -150,12 +126,31 @@ class ImageAlbumRepositoryTest {
*/
@Test
void testCountReturnsAmountOfSavedEntities() {
- imageAlbumRepository.save(new ImageAlbum());
- imageAlbumRepository.save(new ImageAlbum());
+ albumRepository.save(new Album());
+ albumRepository.save(new Album());
- long imageAlbumCount = imageAlbumRepository.count();
+ long albumCount = albumRepository.count();
- assertEquals(2, imageAlbumCount);
+ assertEquals(2, albumCount);
+ }
+
+ /**
+ * Test that finding albums by username returns all albums
+ * created by the user with the given username.
+ */
+ @Test
+ void testFindByUsernameReturnsAllAlbumsWithGivenUser() {
+ Album albumWithUser = new Album();
+ albumWithUser.setUser(currentUser);
+
+ albumRepository.save(albumWithUser);
+ Optional<Album> expectedAlbum = albumRepository.findById(IMAGE_ALBUM_INITIAL_ID);
+
+ List<Album> foundAlbums = albumRepository.
+ findAllByUsername(currentUser.getUsername());
+
+ assertEquals(1, foundAlbums.size());
+ assertTrue(foundAlbums.contains(expectedAlbum.get()));
}
}
\ No newline at end of file
diff --git a/src/test/java/NTNU/IDATT1002/repository/LoginRepositoryTest.java b/src/test/java/NTNU/IDATT1002/repository/LoginRepositoryTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..2cd3f835e6a1c7f1cdaef195e242cc2e8c3339a4
--- /dev/null
+++ b/src/test/java/NTNU/IDATT1002/repository/LoginRepositoryTest.java
@@ -0,0 +1,148 @@
+
+package NTNU.IDATT1002.repository;
+
+import NTNU.IDATT1002.models.Login;
+import NTNU.IDATT1002.models.User;
+import NTNU.IDATT1002.utils.Authentication;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+
+/**
+ * Tests for {@link LoginRepository}
+ *
+ * @author madslun
+ * @version 1.0 17.03.20
+ */
+
+
+class LoginRepositoryTest {
+
+
+ private LoginRepository loginRepository;
+
+ private String username1;
+ private String username2;
+ private String password;
+ private String newPassword;
+ private Date date;
+ private User user1;
+ private User user2;
+ private Login login1;
+ private Login login2;
+
+
+
+/**
+ * Sets up some testdata for thorough testing
+ * So much information has been added for making sure every part works as intended
+ */
+
+ @BeforeEach
+ public void setUp() {
+ EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory("ImageApplicationTest");
+ EntityManager entityManager = entityManagerFactory.createEntityManager();
+ loginRepository = new LoginRepository(entityManager);
+
+ username1 = "test1";
+ username2 = "test2";
+ password = "Test123";
+ newPassword = "Test321";
+ date = new Date(System.currentTimeMillis());
+ user1 = new User(username1,"email","firstName", "lastName", "test" , "test", date);
+ user2 = new User(username2, "email2" , "firstName2", "lastName2", "test2", "test2", date);
+ login1 = new Login(user1, "test", "test");
+ login2 = new Login(user2, "test2", "test2");
+ }
+
+
+/**
+ * Test that saving an entity returns the saved instance
+ */
+
+ @Test
+ void testSaveReturnsInstance() {
+ Optional<Login> optionalLogin = loginRepository.save(login1);
+ assertTrue(optionalLogin.isPresent());
+ }
+
+
+/**
+ * Test that finding all entities returns all entities
+ */
+
+ @Test
+ void testSaveReturnsAllSavedEntities() {
+
+ loginRepository.save(login1);
+ loginRepository.save(login2);
+
+ List<?> foundLogins = loginRepository.findAll();
+ assertEquals(2, foundLogins.size());
+ }
+
+
+/**
+ * Test that saving invalid entity will fail and return empty optional
+ */
+
+ @Test
+ void testSaveInvalidEntityReturnsEmptyOptional() {
+ Optional<Login> savedLogin = loginRepository.save(null);
+
+ assertTrue(savedLogin.isEmpty());
+ }
+
+
+/**
+ * Test that finding entity by id returns optional with the correct id
+ */
+
+ @Test
+ void testFindByIdReturnsOptionalWithEntityWithId() {
+
+ loginRepository.save(login1);
+ Optional<Login> foundLogins = loginRepository.findById(username1);
+
+ assertTrue(foundLogins.isPresent());
+ assertEquals(username1, foundLogins.get().getUser().getUsername());
+ }
+
+/**
+ * Test that deleting by id removes the given entity and returns empty optional
+ */
+ @Test
+ void testDeleteById() {
+ loginRepository.save(login1);
+ Optional<Login> foundLogins = loginRepository.findById(username1);
+
+ foundLogins.ifPresent(Login -> loginRepository.deleteById(username1));
+ Optional<Login> deletedLogin = loginRepository.findById(username1);
+
+ assertTrue(deletedLogin.isEmpty());
+ }
+
+/**
+ * Test that count returns correct amount of enities
+ */
+
+ @Test
+ void testCountReturnsAmountOfSavedEntities() {
+ loginRepository.save(login1);
+ loginRepository.save(login2);
+
+ long loginCount = loginRepository.count();
+
+ assertEquals(2, loginCount);
+ }
+}
diff --git a/src/test/java/NTNU/IDATT1002/utils/AuthenticationTest.java b/src/test/java/NTNU/IDATT1002/utils/AuthenticationTest.java
index b4ed0d37b4b4ce42ac7598ba9b0af3dd10ca84a5..1be9561702d4664fae533dfd7709d287462068f2 100644
--- a/src/test/java/NTNU/IDATT1002/utils/AuthenticationTest.java
+++ b/src/test/java/NTNU/IDATT1002/utils/AuthenticationTest.java
@@ -2,75 +2,75 @@ package NTNU.IDATT1002.utils;
import org.junit.jupiter.api.Test;
+import java.nio.charset.Charset;
import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
import static org.junit.jupiter.api.Assertions.*;
class AuthenticationTest {
+ /**
+ * Testing the method with null as input
+ */
@Test
void testNullAsInputOnsetPassword() throws NoSuchAlgorithmException {
- /**
- * Testing the method with null as input
- */
+
try {
- Authentication.setPassword(null, null);
+ Authentication.setPassword(null);
fail("Expected action to throw IllegalArgumentException ");
} catch (IllegalArgumentException e) {
//Test is a Success
}
}
+ /**
+ * Testing the method with an empty password and an credible username
+ */
@Test
void testBlankPasswordOnsetPassword() throws NoSuchAlgorithmException {
- /**
- * Testing the method with an empty password and an credible username
- */
try {
- Authentication.setPassword("Username", "");
+ Authentication.setPassword("");
fail("Expected action to throw IllegalArgumentException ");
} catch (IllegalArgumentException e) {
//Test is a success as you are not supposed to get anything checked with empty password
}
}
+ /**
+ * Testing the method with an empty username and an credible username
+ */
@Test
void testBlankUsernameOnsetPassword() throws NoSuchAlgorithmException {
- /**
- * Testing the method with an empty username and an credible username
- */
try {
- Authentication.setPassword("", "Password");
- fail("Expected action to throw IllegalArgumentException ");
+ Authentication.setPassword("");
+ fail("Expected action to throw IllegalArgumentException ");
}
catch (IllegalArgumentException e) {
//Test is a success as you are not supposed to get anything checked with empty password
}
}
+ /**
+ * Testing the method with an credible username and password
+ */
@Test
void testCredibleInputOnsetPassword() throws NoSuchAlgorithmException {
- /**
- * TODO: Maybe add actual user credentials as input. Change the boolean
- * Testing the method with an credible username and password
- */
- try {
- assertEquals(false, Authentication.setPassword("Username", "Password"));
- }
- catch (Exception e) {
- fail("Method should not throw an exception with this input");
- }
+ String password = "Test123";
+ ArrayList<String> credentials = Authentication.setPassword(password);
+ String salt = credentials.get(0);
+ String hash = credentials.get(1);
+ assertTrue(Authentication.isCorrectPassword(salt, password, hash));
}
-
+ /**
+ * Testing the method with null ass input
+ */
@Test
void testNullAsInputOnisCorrectPassword() {
- /**
- * Testing the method with null ass input
- */
try {
- Authentication.isCorrectPassword(null, null);
+ Authentication.isCorrectPassword(null, null, null);
fail("Expected action to throw IllegalArgumentException ");
}
catch (IllegalArgumentException e) {
@@ -78,26 +78,27 @@ class AuthenticationTest {
}
}
+ /**
+ * Testing the method with an empty password and an credible username
+ */
@Test
void testBlankPasswordOnisCorrectPassword() throws NoSuchAlgorithmException {
- /**
- * Testing the method with an empty password and an credible username
- */
try {
- Authentication.isCorrectPassword("Username", "");
+ Authentication.isCorrectPassword("Username", "", "");
fail("Expected action to throw IllegalArgumentException ");
} catch (IllegalArgumentException e) {
//Test is a success as you are not supposed to get anything checked with empty password
}
}
+
+ /**
+ * Testing the method with an empty username and an credible username
+ */
@Test
void testBlankUsernameOnisCorrectPassword() throws NoSuchAlgorithmException {
- /**
- * Testing the method with an empty username and an credible username
- */
try {
- Authentication.isCorrectPassword("", "Password");
+ Authentication.isCorrectPassword("", "Password", "");
fail("Expected action to throw IllegalArgumentException ");
}
catch (IllegalArgumentException e) {
@@ -105,19 +106,16 @@ class AuthenticationTest {
}
}
+
+ /**
+ * Testing the method with an credible username and password
+ */
@Test
void testCredibleInputOnisCorrectPassword() throws NoSuchAlgorithmException {
- /**
- * TODO: Maybe add actual user credentials as input. Change the boolean
- * Testing the method with an credible username and password
- */
- try {
- assertEquals(false, Authentication.isCorrectPassword("Username", "Password"));
- fail("The salt is set as null automatically. The test should therefore throw IllegalArgumentException");
- }
- catch (Exception e) {
- //Salt is set to null since it is not connected to database and should therefore throw exception
- }
+ ArrayList<String> credentials = Authentication.setPassword("test");
+ String saltAsString = credentials.get(0);
+ String hash = credentials.get(1);
+ assertTrue(Authentication.isCorrectPassword(saltAsString, "test", hash));
}
}
diff --git a/src/test/java/NTNU/IDATT1002/utils/PdfDocumentTest.java b/src/test/java/NTNU/IDATT1002/utils/PdfDocumentTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..d2b5913299b3589a0cbf903793ad4228c18454f7
--- /dev/null
+++ b/src/test/java/NTNU/IDATT1002/utils/PdfDocumentTest.java
@@ -0,0 +1,73 @@
+package NTNU.IDATT1002.utils;
+
+import NTNU.IDATT1002.models.Image;
+import NTNU.IDATT1002.models.Album;
+import NTNU.IDATT1002.models.User;
+import NTNU.IDATT1002.service.PdfDocument;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.util.Date;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+
+/**
+ * Class PdfDocumentTest to test the generation of pdf documents.
+ */
+class PdfDocumentTest {
+
+ private static final String PATH_TO_PDF = "src/test/java/tmp/generatedAlbumPdf.pdf";
+ private Album album;
+ private Image image;
+ private User user;
+
+ /**
+ * Setup an album with a user and two images.
+ */
+ @BeforeEach
+ public void setup() {
+ byte[] byteFile = ImageUtil.convertToBytes("src/test/java/tmp/test_image_1.jpg");
+ image = new Image();
+ image.setRawImage(byteFile);
+
+ user = new User();
+ user.setUsername("Alex Johnson");
+
+ album = new Album();
+ album.setTitle("Test Title");
+ album.setUser(user);
+ album.setDescription("This is a test.");
+ album.setCreatedAt(new Date());
+ album.addImage(image);
+
+ byteFile = ImageUtil.convertToBytes("src/test/java/tmp/test_image_2.jpg");
+ image = new Image();
+ image.setRawImage(byteFile);
+ album.addImage(image);
+ }
+
+ /**
+ * Delete the generated pdf after all tests have been executed.
+ */
+ @AfterAll
+ public static void tearDown() {
+ File file = new File(PATH_TO_PDF);
+ file.delete();
+ }
+
+ /**
+ * Test that a pdf document is successfully created.
+ */
+ @Test
+ void testCreateDocumentCreatesPdfDocument() {
+ PdfDocument document = new PdfDocument(album, PATH_TO_PDF);
+ document.createDocument();
+
+ assertNotNull(document);
+ }
+
+
+}
\ No newline at end of file
diff --git a/src/test/java/tmp/test_image_1.jpg b/src/test/java/tmp/test_image_1.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b0e20dcf03e505e252385013c302b859b5f44286
Binary files /dev/null and b/src/test/java/tmp/test_image_1.jpg differ
diff --git a/src/test/java/tmp/test_image_2.jpg b/src/test/java/tmp/test_image_2.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..b6b93b4b504f34d03e33ee7cc207c2b2c6aceceb
Binary files /dev/null and b/src/test/java/tmp/test_image_2.jpg differ
diff --git a/src/test/resources/META-INF/persistence.xml b/src/test/resources/META-INF/persistence.xml
index 5af16a1cdbdc93f107d15dd5c00bec66cd883601..1292de038e0fa99c3a4fc9aacac92c969b8076f1 100644
--- a/src/test/resources/META-INF/persistence.xml
+++ b/src/test/resources/META-INF/persistence.xml
@@ -9,8 +9,13 @@
<!-- Entity classes -->
<class>NTNU.IDATT1002.models.User</class>
+ <class>NTNU.IDATT1002.models.Login</class>
<class>NTNU.IDATT1002.models.Image</class>
- <class>NTNU.IDATT1002.models.ImageAlbum</class>
+ <class>NTNU.IDATT1002.models.Album</class>
+ <class>NTNU.IDATT1002.models.Metadata</class>
+ <class>NTNU.IDATT1002.models.Tag</class>
+ <class>NTNU.IDATT1002.models.Histogram</class>
+ <class>NTNU.IDATT1002.models.GeoLocation</class>
<properties>
<!-- Configuring JDBC properties -->
@@ -25,7 +30,7 @@
<property name="hibernate.use_sql_comments" value="true"/>
<!-- Create tables on startup -->
- <property name="hibernate.hbm2ddl.auto" value="create" />
+ <property name="hibernate.hbm2ddl.auto" value="create-drop" />
</properties>
</persistence-unit>
</persistence>
\ No newline at end of file