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
db5310f1
Commit
db5310f1
authored
5 years ago
by
Eirik Steira
Browse files
Options
Downloads
Patches
Plain Diff
Rename field albumId to chosenAlbumId
parent
c8629ef6
No related branches found
No related tags found
2 merge requests
!104
Weekly merge to Master
,
!71
Rename field albumId to chosenAlbumId
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/NTNU/IDATT1002/controllers/DataExchange.java
+5
-5
5 additions, 5 deletions
src/main/java/NTNU/IDATT1002/controllers/DataExchange.java
src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
+1
-1
1 addition, 1 deletion
src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
with
6 additions
and
6 deletions
src/main/java/NTNU/IDATT1002/controllers/DataExchange.java
+
5
−
5
View file @
db5310f1
...
...
@@ -11,7 +11,7 @@ import java.util.List;
public
class
DataExchange
{
private
String
searchField
;
private
List
<
File
>
uploadedFiles
;
private
Long
a
lbumId
;
private
Long
chosenA
lbumId
;
public
DataExchange
(){
searchField
=
""
;
...
...
@@ -24,8 +24,8 @@ public class DataExchange {
return
searchField
;
}
public
Long
getAlbumId
()
{
return
a
lbumId
;
public
Long
get
Chosen
AlbumId
()
{
return
chosenA
lbumId
;
}
public
void
setUploadedFiles
(
List
<
File
>
uploadedFiles
)
{
...
...
@@ -36,7 +36,7 @@ public class DataExchange {
this
.
searchField
=
searchField
;
}
public
void
setAlbumId
(
Long
albumId
)
{
this
.
a
lbumId
=
albumId
;
public
void
set
Chosen
AlbumId
(
Long
albumId
)
{
this
.
chosenA
lbumId
=
albumId
;
}
}
This diff is collapsed.
Click to expand it.
src/main/java/NTNU/IDATT1002/controllers/ExploreAlbums.java
+
1
−
1
View file @
db5310f1
...
...
@@ -414,7 +414,7 @@ public class ExploreAlbums implements Initializable {
public
void
switchToViewAlbum
(
ActionEvent
actionEvent
)
throws
IOException
{
Button
source
=
(
Button
)
actionEvent
.
getSource
();
Long
albumId
=
Long
.
parseLong
(
source
.
getId
());
App
.
ex
.
setAlbumId
(
albumId
);
App
.
ex
.
set
Chosen
AlbumId
(
albumId
);
App
.
setRoot
(
"view_album"
);
}
...
...
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