LibreCCM
/
scientificcms
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change names of properties for start and end page of an article

pull/1/head
Jens Pelzetter 2019-09-05 11:02:54 +02:00
parent 5d95786be4
commit 1f3a4a0baa
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sci-publications/src/main/java/org/scientificcms/publications/ArticleInCollectedVolume.java
View File

@ -32,11 +32,11 @@ public class ArticleInCollectedVolume extends Publication {
@JoinColumn(name = "COLLECTED_VOLUME_ID")
private CollectedVolume collectedVolume;
@Column(name = "PAGES_FROM")
private Integer pagesFrom;
@Column(name = "START_PAGE")
private Integer startPage;
@Column(name = "PAGES_TO")
private Integer pagesTo;
@Column(name = "END_PAGE")
private Integer endPage;
@Column(name = "CHAPTER", length = 1024)
private String chapter;
@ -49,20 +49,20 @@ public class ArticleInCollectedVolume extends Publication {
this.collectedVolume = collectedVolume;
}
public Integer getPagesFrom() {
return pagesFrom;
public Integer getStartPage() {
return startPage;
}
public void setPagesFrom(final Integer pagesFrom) {
this.pagesFrom = pagesFrom;
public void setStartPage(final Integer startPage) {
this.startPage = startPage;
}
public Integer getPagesTo() {
return pagesTo;
public Integer getEndPage() {
return endPage;
}
public void setPagesTo(final Integer pagesTo) {
this.pagesTo = pagesTo;
public void setEndPage(final Integer endPage) {
this.endPage = endPage;
}
public String getChapter() {
@ -77,8 +77,8 @@ public class ArticleInCollectedVolume extends Publication {
public int hashCode() {
int hash = super.hashCode();
hash = 47 * hash + Objects.hashCode(collectedVolume);
hash = 47 * hash + Objects.hashCode(pagesFrom);
hash = 47 * hash + Objects.hashCode(pagesTo);
hash = 47 * hash + Objects.hashCode(startPage);
hash = 47 * hash + Objects.hashCode(endPage);
hash = 47 * hash + Objects.hashCode(chapter);
return hash;
}
@ -107,10 +107,10 @@ public class ArticleInCollectedVolume extends Publication {
if (!Objects.equals(collectedVolume, other.getCollectedVolume())) {
return false;
}
if (!Objects.equals(pagesFrom, other.getPagesFrom())) {
if (!Objects.equals(startPage, other.getStartPage())) {
return false;
}
return Objects.equals(pagesTo, other.getPagesTo());
return Objects.equals(endPage, other.getEndPage());
}
@Override
@ -123,12 +123,12 @@ public class ArticleInCollectedVolume extends Publication {
return super.toString(String.format(", collectedVolume = %s, "
+ "chapter = \"%s\", "
+ "pagesFrom = %d, "
+ "pagesTo = %d%s",
+ "startPage = %d, "
+ "endPage = %d%s",
Objects.toString(collectedVolume),
chapter,
pagesFrom,
pagesTo,
startPage,
endPage,
data));
}

40
sci-publications/src/main/java/org/scientificcms/publications/ArticleInJournal.java
View File

@ -39,11 +39,11 @@ public class ArticleInJournal extends Publication {
@Column(name = "ISSUE")
private String issue;
@Column(name = "PAGES_FROM")
private Integer pagesFrom;
@Column(name = "START_PAGE")
private Integer startPage;
@Column(name = "PAGES_TO")
private Integer pagesTo;
@Column(name = "END_PAGE")
private Integer endPage;
@Column(name = "PUBLICATION_DATE")
private LocalDate publicationDate;
@ -72,20 +72,20 @@ public class ArticleInJournal extends Publication {
this.issue = issue;
}
public Integer getPagesFrom() {
return pagesFrom;
public Integer getStartPage() {
return startPage;
}
public void setPagesFrom(final Integer pagesFrom) {
this.pagesFrom = pagesFrom;
public void setStartPage(final Integer startPage) {
this.startPage = startPage;
}
public Integer getPagesTo() {
return pagesTo;
public Integer getEndPage() {
return endPage;
}
public void setPagesTo(final Integer pagesTo) {
this.pagesTo = pagesTo;
public void setEndPage(final Integer endPage) {
this.endPage = endPage;
}
public LocalDate getPublicationDate() {
@ -102,8 +102,8 @@ public class ArticleInJournal extends Publication {
hash = 67 * hash + Objects.hashCode(journal);
hash = 67 * hash + Objects.hashCode(volume);
hash = 67 * hash + Objects.hashCode(issue);
hash = 67 * hash + Objects.hashCode(pagesFrom);
hash = 67 * hash + Objects.hashCode(pagesTo);
hash = 67 * hash + Objects.hashCode(startPage);
hash = 67 * hash + Objects.hashCode(endPage);
hash = 67 * hash + Objects.hashCode(publicationDate);
return hash;
}
@ -135,10 +135,10 @@ public class ArticleInJournal extends Publication {
if (!Objects.equals(issue, other.getIssue())) {
return false;
}
if (!Objects.equals(pagesFrom, other.getPagesFrom())) {
if (!Objects.equals(startPage, other.getStartPage())) {
return false;
}
if (!Objects.equals(pagesTo, other.getPagesTo())) {
if (!Objects.equals(endPage, other.getEndPage())) {
return false;
}
return Objects.equals(publicationDate, other.getPublicationDate());
@ -154,14 +154,14 @@ public class ArticleInJournal extends Publication {
return super.toString(String.format(", journal = %s, "
+ "volume = %d, "
+ "issue = \"%s\", "
+ "pagesFrom = %d, "
+ "pagesTo = %d, "
+ "startPage = %d, "
+ "endPage = %d, "
+ "publicationDate = %s%s",
Objects.toString(journal),
volume,
issue,
pagesFrom,
pagesTo,
startPage,
endPage,
Objects.toString(publicationDate),
data));
}