Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Team 14 - IDATT1002
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Eirik Steira
Team 14 - IDATT1002
Commits
9980f074
Commit
9980f074
authored
5 years ago
by
Nicolay Schiøll-Johansen
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix' into 'dev'
bugfix See merge request
!57
parents
16e0bb3f
512cf907
No related branches found
Branches containing commit
No related tags found
2 merge requests
!104
Weekly merge to Master
,
!57
bugfix
Pipeline
#76482
passed
5 years ago
Stage: build
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/NTNU/IDATT1002/controllers/DataExchange.java
+3
-0
3 additions, 0 deletions
src/main/java/NTNU/IDATT1002/controllers/DataExchange.java
src/main/java/NTNU/IDATT1002/controllers/Explore.java
+9
-0
9 additions, 0 deletions
src/main/java/NTNU/IDATT1002/controllers/Explore.java
with
12 additions
and
0 deletions
src/main/java/NTNU/IDATT1002/controllers/DataExchange.java
+
3
−
0
View file @
9980f074
...
...
@@ -12,6 +12,9 @@ public class DataExchange {
private
String
searchField
;
private
List
<
File
>
uploadedFiles
;
public
DataExchange
(){
searchField
=
""
;
}
public
List
<
File
>
getUploadedFiles
()
{
return
uploadedFiles
;
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/NTNU/IDATT1002/controllers/Explore.java
+
9
−
0
View file @
9980f074
...
...
@@ -103,6 +103,15 @@ public class Explore {
App
.
setRoot
(
"upload"
);
}
/**
* Method that changes stage to View Picture page for the image that was clicked
* @param mouseEvent
* @throws IOException
*/
public
void
switchToPicture
(
MouseEvent
mouseEvent
)
throws
IOException
{
App
.
setRoot
(
"view_picture"
);
}
/**
* Method that updates content to previous "page"
* @param actionEvent
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment