Skip to content

Commit 82f9825

Browse files
committed
#4813 remove marked as dup from file metadata
1 parent d0bfd3d commit 82f9825

2 files changed

Lines changed: 0 additions & 18 deletions

File tree

src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2300,7 +2300,6 @@ private String processUploadedFileList(List<DataFile> dFileList) {
23002300
//allowing the user to decide whether to delete
23012301
// deleteTempFile(dataFile);
23022302
dataFile.setMarkedAsDuplicate(true);
2303-
dataFile.getFileMetadata().setMarkedAsDuplicate(true);
23042303
dataFile.setDuplicateFilename(inLineMessage);
23052304

23062305
} else if (isFileAlreadyUploaded(dataFile)) {
@@ -2317,9 +2316,7 @@ private String processUploadedFileList(List<DataFile> dFileList) {
23172316
}
23182317
//now we are marking as duplicate and
23192318
//allowing the user to decide whether to delete
2320-
// deleteTempFile(dataFile);
23212319
dataFile.setMarkedAsDuplicate(true);
2322-
dataFile.getFileMetadata().setMarkedAsDuplicate(true);
23232320
List<String> args = Arrays.asList(existingFile.getDisplayName());
23242321
String inLineMessage = BundleUtil.getStringFromBundle("dataset.file.inline.message", args);
23252322
dataFile.setDuplicateFilename(inLineMessage);

src/main/java/edu/harvard/iq/dataverse/FileMetadata.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -472,21 +472,6 @@ public void setSelected(boolean selected) {
472472
this.selected = selected;
473473
}
474474

475-
/*
476-
For use during file upload so that the user may delete
477-
files that have already been uploaded to the current dataset version
478-
*/
479-
480-
@Transient
481-
private boolean markedAsDuplicate;
482-
483-
public boolean isMarkedAsDuplicate() {
484-
return markedAsDuplicate;
485-
}
486-
487-
public void setMarkedAsDuplicate(boolean markedAsDuplicate) {
488-
this.markedAsDuplicate = markedAsDuplicate;
489-
}
490475

491476
@Transient
492477
private boolean restrictedUI;

0 commit comments

Comments
 (0)