Skip to content
Snippets Groups Projects
Commit 489aba70 authored by Lars Brodin Østby's avatar Lars Brodin Østby Committed by Eirik Steira
Browse files

image upload update

parent 2b49065d
No related branches found
No related tags found
2 merge requests!104Weekly merge to Master,!75Single photo upload
...@@ -2,8 +2,7 @@ package NTNU.IDATT1002.controllers; ...@@ -2,8 +2,7 @@ package NTNU.IDATT1002.controllers;
import NTNU.IDATT1002.App; import NTNU.IDATT1002.App;
import NTNU.IDATT1002.ApplicationState; import NTNU.IDATT1002.ApplicationState;
import NTNU.IDATT1002.models.Tag;
import NTNU.IDATT1002.models.User;
import NTNU.IDATT1002.service.ImageService; import NTNU.IDATT1002.service.ImageService;
import java.io.File; import java.io.File;
import java.util.Arrays; import java.util.Arrays;
...@@ -134,15 +133,16 @@ public class UploadedSingle implements Initializable { ...@@ -134,15 +133,16 @@ public class UploadedSingle implements Initializable {
*/ */
public void uploadSingle(ActionEvent actionEvent) throws IOException { public void uploadSingle(ActionEvent actionEvent) throws IOException {
List<File> list = App.ex.getUploadedFiles(); List<File> list = App.ex.getUploadedFiles();
list.stream().forEach(x -> { File fil = list.get(0);
imageService.createImage(applicationState.getCurrentUser(), fil);
/* list.stream().forEach(x -> {
image = imageService.createImage(applicationState.getCurrentUser(), x).get(); image = imageService.createImage(applicationState.getCurrentUser(), x).get();
List tags = tagStringSplit(photo_tag); List tags = tagStringSplit(photo_tag);
tags.stream().forEach(y -> { tags.stream().forEach(y -> {
imageService.addTagToImage(image, new Tag((Tag) y)); imageService.addTagToImage(image, new Tag((Tag) y));
}); });
}); });*/
App.setRoot("main"); App.setRoot("main");
} }
...@@ -153,8 +153,9 @@ public class UploadedSingle implements Initializable { ...@@ -153,8 +153,9 @@ public class UploadedSingle implements Initializable {
* @return list of string * @return list of string
*/ */
public List<String> tagStringSplit(TextField photo_tag) { public List<String> tagStringSplit(TextField photo_tag) {
String tagTekst = photo_tag.toString(); String tagTekst = photo_tag.getText();
return Arrays.asList(tagTekst.split("(?=#)")); return Arrays.asList(tagTekst.split("(?=#)"));
} }
} }
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