LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

Some code formatting

pull/10/head
Jens Pelzetter 2021-12-14 19:24:32 +01:00
parent 470b1628e9
commit 26429cfda3
2 changed files with 58 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticle.java
View File

@ -51,10 +51,10 @@ import static org.librecms.CmsConstants.*;
@Entity
@Audited
@Table(name = "MULTIPART_ARTICLES", schema = DB_SCHEMA)
@ContentTypeDescription(labelBundle
= "org.librecms.contenttypes.MultiPartArticle",
descriptionBundle
= "org.librecms.contenttypes.MultiPartArticle")
@ContentTypeDescription(
labelBundle = "org.librecms.contenttypes.MultiPartArticle",
descriptionBundle = "org.librecms.contenttypes.MultiPartArticle"
)
@AuthoringKit(
createComponent = MultiPartArticleCreateForm.class,
steps = {
@ -65,16 +65,18 @@ import static org.librecms.CmsConstants.*;
descriptionBundle = CmsConstants.CMS_BUNDLE,
descriptionKey = "cms.contenttypes.shared.basic_properties"
+ ".description",
order = 1)
,
order = 1
),
@AuthoringStep(
component = MultiPartArticleSectionsStep.class,
labelBundle = CmsConstants.CMS_BUNDLE,
labelKey = "cms.contenttypes.shared.body_text.title",
descriptionBundle = CmsConstants.CMS_BUNDLE,
descriptionKey = "mparticle.authoring.body_text.description",
order = 2)
})
order = 2
)
}
)
public class MultiPartArticle extends ContentItem implements Serializable {
private static final long serialVersionUID = -587374085831420868L;
@ -82,11 +84,14 @@ public class MultiPartArticle extends ContentItem implements Serializable {
@Embedded
@AssociationOverride(
name = "values",
joinTable = @JoinTable(name = "MPA_SUMMARIES",
schema = DB_SCHEMA,
joinColumns = {
@JoinColumn(name = "OBJECT_ID")}
))
joinTable = @JoinTable(
name = "MPA_SUMMARIES",
schema = DB_SCHEMA,
joinColumns = {
@JoinColumn(name = "OBJECT_ID")
}
)
)
private LocalizedString summary = new LocalizedString();
@OneToMany
@ -170,9 +175,13 @@ public class MultiPartArticle extends ContentItem implements Serializable {
@Override
public String toString(final String data) {
return super.toString(String.format(", summary = %s%s",
Objects.toString(summary),
data));
return super.toString(
String.format(
", summary = %s%s",
Objects.toString(summary),
data
)
);
}
}

58
ccm-cms/src/main/java/org/librecms/contenttypes/MultiPartArticleSection.java
View File

@ -51,12 +51,13 @@ import static org.librecms.CmsConstants.*;
@NamedQuery(
name = "MultiPartArticleSection.findById",
query = "SELECT s FROM MultiPartArticleSection s "
+ "WHERE s.sectionId = :sectionId")
,
+ "WHERE s.sectionId = :sectionId"
),
@NamedQuery(
name = "MultiPartArticleSection.findArticleOfSection",
query = "SELECT a FROM MultiPartArticle a "
+ "WHERE :section MEMBER OF a.sections")
+ "WHERE :section MEMBER OF a.sections"
)
})
public class MultiPartArticleSection implements Serializable {
@ -70,11 +71,14 @@ public class MultiPartArticleSection implements Serializable {
@Embedded
@AssociationOverride(
name = "values",
joinTable = @JoinTable(name = "MPA_SECTION_TITLES",
schema = DB_SCHEMA,
joinColumns = {
@JoinColumn(name = "OBJECT_ID")}
))
joinTable = @JoinTable(
name = "MPA_SECTION_TITLES",
schema = DB_SCHEMA,
joinColumns = {
@JoinColumn(name = "OBJECT_ID")
}
)
)
private LocalizedString title;
@Column(name = "RANK")
@ -86,11 +90,14 @@ public class MultiPartArticleSection implements Serializable {
@Embedded
@AssociationOverride(
name = "values",
joinTable = @JoinTable(name = "MPA_SECTION_TEXTS",
schema = DB_SCHEMA,
joinColumns = {
@JoinColumn(name = "OBJECT_ID")}
))
joinTable = @JoinTable(
name = "MPA_SECTION_TEXTS",
schema = DB_SCHEMA,
joinColumns = {
@JoinColumn(name = "OBJECT_ID")
}
)
)
private LocalizedString text;
public MultiPartArticleSection() {
@ -189,18 +196,19 @@ public class MultiPartArticleSection implements Serializable {
}
public String toString(final String data) {
return String.format("%s{ "
+ "title = %s, "
+ "rank = %d,"
+ "pageBreak = %b, "
+ "text = %s%d"
+ " }",
super.toString(),
title,
rank,
pageBreak,
text,
data
return String.format(
"%s{ "
+ "title = %s, "
+ "rank = %d,"
+ "pageBreak = %b, "
+ "text = %s%d"
+ " }",
super.toString(),
title,
rank,
pageBreak,
text,
data
);
}