Revision 59813
Added by Konstantina Galouni over 3 years ago
Topic.java | ||
---|---|---|
4 | 4 |
import org.springframework.data.annotation.Id; |
5 | 5 |
|
6 | 6 |
import java.util.ArrayList; |
7 |
import java.util.Date; |
|
7 | 8 |
import java.util.List; |
8 | 9 |
|
9 | 10 |
public class Topic<StringOrCategory> { |
... | ... | |
15 | 16 |
private String alias; |
16 | 17 |
private String description; |
17 | 18 |
private String icon; |
18 |
private boolean isActive; |
|
19 |
private boolean isPublic; |
|
19 |
private Visibility visibility = Visibility.PRIVATE; |
|
20 |
private Date creationDate; |
|
21 |
private Date updateDate; |
|
20 | 22 |
private String defaultId; |
21 | 23 |
private List<StringOrCategory> categories; |
22 | 24 |
|
... | ... | |
27 | 29 |
alias = topic.getAlias(); |
28 | 30 |
description = topic.getDescription(); |
29 | 31 |
icon = topic.getIcon(); |
30 |
isActive = topic.getIsActive(); |
|
31 |
isPublic = topic.getIsPublic(); |
|
32 |
setVisibility(topic.getVisibility()); |
|
33 |
creationDate = topic.getCreationDate(); |
|
34 |
updateDate = topic.getUpdateDate(); |
|
32 | 35 |
defaultId = topic.getDefaultId(); |
33 | 36 |
} |
34 | 37 |
|
... | ... | |
37 | 40 |
setAlias(defaultTopic.getAlias()); |
38 | 41 |
setDescription(defaultTopic.getDescription()); |
39 | 42 |
setIcon(defaultTopic.getIcon()); |
40 |
setIsActive(defaultTopic.getIsActive()); |
|
41 |
setIsPublic(defaultTopic.getIsPublic()); |
|
43 |
setVisibility(defaultTopic.getVisibility()); |
|
44 |
setCreationDate(defaultTopic.getCreationDate()); |
|
45 |
setUpdateDate(defaultTopic.getUpdateDate()); |
|
42 | 46 |
setDefaultId(defaultTopic.getId()); |
43 | 47 |
setCategories(new ArrayList()); |
44 | 48 |
} |
... | ... | |
83 | 87 |
this.icon = icon; |
84 | 88 |
} |
85 | 89 |
|
86 |
public boolean getIsActive() {
|
|
87 |
return isActive;
|
|
90 |
public Visibility getVisibility() {
|
|
91 |
return visibility;
|
|
88 | 92 |
} |
89 | 93 |
|
90 |
public void setIsActive(boolean isActive) {
|
|
91 |
this.isActive = isActive;
|
|
94 |
public void setVisibility(Visibility visibility) {
|
|
95 |
this.visibility = visibility;
|
|
92 | 96 |
} |
93 | 97 |
|
94 |
public boolean getIsPublic() {
|
|
95 |
return isPublic;
|
|
98 |
public Date getCreationDate() {
|
|
99 |
return creationDate;
|
|
96 | 100 |
} |
97 | 101 |
|
98 |
public void setIsPublic(boolean isPublic) {
|
|
99 |
this.isPublic = isPublic;
|
|
102 |
public void setCreationDate(Date creationDate) {
|
|
103 |
this.creationDate = creationDate;
|
|
100 | 104 |
} |
101 | 105 |
|
106 |
public Date getUpdateDate() { |
|
107 |
return updateDate; |
|
108 |
} |
|
109 |
|
|
110 |
public void setUpdateDate(Date updateDate) { |
|
111 |
this.updateDate = updateDate; |
|
112 |
} |
|
113 |
|
|
102 | 114 |
public String getDefaultId() { |
103 | 115 |
return defaultId; |
104 | 116 |
} |
Also available in: Unified diff
[Trunk | Monitor Service]:
1. In all enums, add capitalized values too (maybe in the future, lowercased values will be removed - NOT NOW).
2. Visibility.java: New enumeration Visibility added with values: PUBLIC, RESTRICTED, PRIVATE (will replace isPublic and isActive fields).
3. Stakeholder.java:
a. Add field "isUpload" (default value: false) to define if "logoUrl" is a link, or a locally uploaded image.
b. Remove fields "isActive" and "isPublic" and add field "visibility" (default value: Visibility.PRIVATE).
c. Remove unused field "managers" (managers are defined from aai roles).
4. Topic.java & Category.java & SubCategory.java:
a. Remove fields "isActive" and "isPublic" and add field "visibility" (default value: Visibility.PRIVATE).
b. Add fields "creationDate" and "updateDate".
5. Section.java: Add fields "creationDate" and "updateDate".
6. Indicator.java:
a. Rename enumeration "IndicatorWidth" to "IndicatorSize" (will be used for width and height).
b. Add field "additionalDescription" (for default profiles, "description" can now be changed only by default profiles settings,
while "additionalDescription" can also be changed by managers too).
c. Add field "height" (default value: IndicatorSize.MEDIUM).
d. Remove fields "isActive" and "isPublic" and add field "visibility" (default value: Visibility.PRIVATE).
e. Add fields "creationDate" and "updateDate".