Skip to content

Commit

Permalink
reformat IQSS#3418
Browse files Browse the repository at this point in the history
  • Loading branch information
@pdurbin
pdurbin committed Nov 4, 2016
1 parent c24f5e9 commit b74d8e5
Showing 1 changed file with 28 additions and 29 deletions.
57 changes: 28 additions & 29 deletions src/main/java/edu/harvard/iq/dataverse/Dataset.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ public class Dataset extends DvObjectContainer {
@OneToOne(cascade = {CascadeType.MERGE, CascadeType.PERSIST})
@JoinColumn(name = "guestbook_id", unique = false, nullable = true, insertable = true, updatable = true)
private Guestbook guestbook;
@OneToMany(mappedBy="dataset", cascade={CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})

@OneToMany(mappedBy = "dataset", cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
private List<DatasetLinkingDataverse> datasetLinkingDataverses;

public List<DatasetLinkingDataverse> getDatasetLinkingDataverses() {
Expand All @@ -88,18 +88,18 @@ public void setDatasetLinkingDataverses(List<DatasetLinkingDataverse> datasetLin
private boolean fileAccessRequest;
@OneToMany(mappedBy = "dataset", orphanRemoval = true, cascade = {CascadeType.REMOVE, CascadeType.MERGE, CascadeType.PERSIST})
private List<DataFileCategory> dataFileCategories = null;

@ManyToOne
@JoinColumn(name = "citationDateDatasetFieldType_id")
private DatasetFieldType citationDateDatasetFieldType;

public DatasetFieldType getCitationDateDatasetFieldType() {
return citationDateDatasetFieldType;
}

public void setCitationDateDatasetFieldType(DatasetFieldType citationDateDatasetFieldType) {
this.citationDateDatasetFieldType = citationDateDatasetFieldType;
}
}

public Dataset() {
//this.versions = new ArrayList();
Expand Down Expand Up @@ -159,7 +159,7 @@ public Date getLastExportTime() {
public void setLastExportTime(Date lastExportTime) {
this.lastExportTime = lastExportTime;
}

public Guestbook getGuestbook() {
return guestbook;
}
Expand All @@ -180,7 +180,7 @@ public String getPersistentURL() {
return new GlobalId(this).toURL().toString();
}

public String getGlobalId() {
public String getGlobalId() {
return new GlobalId(this).toString();
}

Expand Down Expand Up @@ -253,16 +253,16 @@ private DatasetVersion createNewDatasetVersion(Template template) {
dsv.updateDefaultValuesFromTemplate(template);
} else {
latestVersion = getLatestVersionForCopy();
if (latestVersion.getUNF() != null){

if (latestVersion.getUNF() != null) {
dsv.setUNF(latestVersion.getUNF());
}

if (latestVersion.getDatasetFields() != null && !latestVersion.getDatasetFields().isEmpty()) {
dsv.setDatasetFields(dsv.copyDatasetFields(latestVersion.getDatasetFields()));
}
if (latestVersion.getTermsOfUseAndAccess()!= null){

if (latestVersion.getTermsOfUseAndAccess() != null) {
dsv.setTermsOfUseAndAccess(latestVersion.getTermsOfUseAndAccess().copyTermsOfUseAndAccess());
} else {
TermsOfUseAndAccess terms = new TermsOfUseAndAccess();
Expand Down Expand Up @@ -303,7 +303,6 @@ private DatasetVersion createNewDatasetVersion(Template template) {
return dsv;
}


public DatasetVersion getEditVersion() {
return getEditVersion(null);
}
Expand All @@ -319,10 +318,10 @@ public DatasetVersion getEditVersion(Template template) {
}
}

public DatasetVersion getCreateVersion() {
public DatasetVersion getCreateVersion() {
DatasetVersion dsv = new DatasetVersion();
dsv.setVersionState(DatasetVersion.VersionState.DRAFT);
dsv.setDataset(this);
dsv.setDataset(this);
dsv.initDefaultValues();
this.setVersions(new ArrayList());
getVersions().add(0, dsv);
Expand Down Expand Up @@ -399,6 +398,7 @@ public void setCategoriesByName(List<String> newCategoryNames) {
}
}
}

/*
public void addCategoryByName(String newCategoryName) {
if (newCategoryName != null && !newCategoryName.equals("")) {
Expand Down Expand Up @@ -435,8 +435,8 @@ public DataFileCategory getCategoryByName(String categoryName) {
private Collection<String> getCategoryNames() {
if (dataFileCategories != null) {
ArrayList<String> ret = new ArrayList<>(dataFileCategories.size());
for ( DataFileCategory dfc : dataFileCategories ) {
ret.add( dfc.getName() );
for (DataFileCategory dfc : dataFileCategories) {
ret.add(dfc.getName());
}
return ret;
} else {
Expand Down Expand Up @@ -517,8 +517,8 @@ public String getCitation(boolean isOnlineVersion, DatasetVersion version) {
}

public String getPublicationDateFormattedYYYYMMDD() {
if (getPublicationDate() != null){
return new SimpleDateFormat("yyyy-MM-dd").format(getPublicationDate());
if (getPublicationDate() != null) {
return new SimpleDateFormat("yyyy-MM-dd").format(getPublicationDate());
}
return null;
}
Expand All @@ -532,8 +532,8 @@ public void setThumbnailFile(DataFile thumbnailFile) {
}

@ManyToOne
@JoinColumn(name="harvestingClient_id")
private HarvestingClient harvestedFrom;
@JoinColumn(name = "harvestingClient_id")
private HarvestingClient harvestedFrom;

public HarvestingClient getHarvestedFrom() {
return this.harvestedFrom;
Expand All @@ -542,20 +542,19 @@ public HarvestingClient getHarvestedFrom() {
public void setHarvestedFrom(HarvestingClient harvestingClientConfig) {
this.harvestedFrom = harvestingClientConfig;
}



public boolean isHarvested() {
return this.harvestedFrom != null;
}

private String harvestIdentifier;

public String getHarvestIdentifier() {
return harvestIdentifier;
return harvestIdentifier;
}

public void setHarvestIdentifier(String harvestIdentifier) {
this.harvestIdentifier = harvestIdentifier;
this.harvestIdentifier = harvestIdentifier;
}

public String getRemoteArchiveURL() {
Expand Down Expand Up @@ -614,7 +613,7 @@ public String getRemoteArchiveURL() {
}
}
return this.getHarvestedFrom().getArchiveUrl();
}else {
} else {
return this.getHarvestedFrom().getArchiveUrl();
}
}
Expand Down Expand Up @@ -655,9 +654,9 @@ public String getDisplayName() {
protected boolean isPermissionRoot() {
return false;
}

@Override
public boolean isAncestorOf( DvObject other ) {
public boolean isAncestorOf(DvObject other) {
return equals(other) || equals(other.getOwner());
}
}

0 comments on commit b74d8e5

Please sign in to comment.