Skip to content
Snippets Groups Projects
Commit 06ddd0d2 authored by Lars Brodin Østby's avatar Lars Brodin Østby
Browse files

Merge branch 'refactor/data-exchange-chosen-album' into 'dev'

Rename field albumId to chosenAlbumId

See merge request !71
parents c8629ef6 db5310f1
No related branches found
No related tags found
2 merge requests!104Weekly merge to Master,!71Rename field albumId to chosenAlbumId
......@@ -11,7 +11,7 @@ import java.util.List;
public class DataExchange {
private String searchField;
private List<File> uploadedFiles;
private Long albumId;
private Long chosenAlbumId;
public DataExchange(){
searchField = "";
......@@ -24,8 +24,8 @@ public class DataExchange {
return searchField;
}
public Long getAlbumId() {
return albumId;
public Long getChosenAlbumId() {
return chosenAlbumId;
}
public void setUploadedFiles(List<File> uploadedFiles) {
......@@ -36,7 +36,7 @@ public class DataExchange {
this.searchField = searchField;
}
public void setAlbumId(Long albumId) {
this.albumId = albumId;
public void setChosenAlbumId(Long albumId) {
this.chosenAlbumId = albumId;
}
}
......@@ -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.setChosenAlbumId(albumId);
App.setRoot("view_album");
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment