Revision 59813
Added by Konstantina Galouni over 3 years ago
Stakeholder.java | ||
---|---|---|
10 | 10 |
enum StakeholderType |
11 | 11 |
{ |
12 | 12 |
// Do not rename or remove existring values. This may cause problems with already stored values in DB |
13 |
funder, ri, project, organization; |
|
13 |
funder, ri, project, organization, |
|
14 |
FUNDER, RI, PROJECT, ORGANIZATION; |
|
14 | 15 |
} |
15 | 16 |
|
16 | 17 |
|
... | ... | |
24 | 25 |
private String index_name; |
25 | 26 |
private String index_shortName; |
26 | 27 |
private String logoUrl; |
28 |
private boolean isUpload = false; |
|
27 | 29 |
private String name; |
28 | 30 |
private String alias; |
29 | 31 |
private String description; |
30 | 32 |
private String defaultId = null; |
31 |
private boolean isActive; |
|
32 |
private boolean isPublic; |
|
33 |
private Visibility visibility = Visibility.PRIVATE; |
|
33 | 34 |
private Date creationDate; |
34 | 35 |
private Date updateDate; |
35 |
private List<String> managers; |
|
36 | 36 |
|
37 | 37 |
private List<StringOrTopic> topics; |
38 | 38 |
|
... | ... | |
46 | 46 |
index_name = stakeholder.getIndex_name(); |
47 | 47 |
index_shortName = stakeholder.getIndex_shortName(); |
48 | 48 |
logoUrl = stakeholder.getLogoUrl(); |
49 |
isUpload = stakeholder.getIsUpload(); |
|
49 | 50 |
name = stakeholder.getName(); |
50 | 51 |
alias = stakeholder.getAlias(); |
51 | 52 |
description = stakeholder.getDescription(); |
52 | 53 |
defaultId = stakeholder.getDefaultId(); |
53 |
isActive = stakeholder.getIsActive(); |
|
54 |
isPublic = stakeholder.getIsPublic(); |
|
54 |
setVisibility(stakeholder.getVisibility()); |
|
55 | 55 |
creationDate = stakeholder.getCreationDate(); |
56 | 56 |
updateDate = stakeholder.getUpdateDate(); |
57 |
managers = stakeholder.getManagers(); |
|
58 | 57 |
} |
59 | 58 |
|
60 | 59 |
public String getId() { |
... | ... | |
121 | 120 |
this.logoUrl = logoUrl; |
122 | 121 |
} |
123 | 122 |
|
123 |
public boolean getIsUpload() { |
|
124 |
return isUpload; |
|
125 |
} |
|
126 |
|
|
127 |
public void setIsUpload(boolean isUpload) { |
|
128 |
this.isUpload = isUpload; |
|
129 |
} |
|
130 |
|
|
124 | 131 |
public String getName() { return name; } |
125 | 132 |
|
126 | 133 |
public void setName(String name) { this.name = name; } |
... | ... | |
149 | 156 |
this.defaultId = defaultId; |
150 | 157 |
} |
151 | 158 |
|
152 |
public boolean getIsActive() { |
|
153 |
return isActive; |
|
159 |
public Visibility getVisibility() { |
|
160 |
//return visibility.getLabel(); |
|
161 |
return visibility; |
|
154 | 162 |
} |
155 | 163 |
|
156 |
public void setIsActive(boolean isActive) { |
|
157 |
this.isActive = isActive; |
|
164 |
public void setVisibility(Visibility visibility) { |
|
165 |
//this.visibility = Visibility.get(visibility); |
|
166 |
this.visibility = visibility; |
|
158 | 167 |
} |
159 | 168 |
|
160 |
public boolean getIsPublic() { |
|
161 |
return isPublic; |
|
162 |
} |
|
163 |
|
|
164 |
public void setIsPublic(boolean isPublic) { |
|
165 |
this.isPublic = isPublic; |
|
166 |
} |
|
167 |
|
|
168 | 169 |
public Date getCreationDate() { |
169 | 170 |
return creationDate; |
170 | 171 |
} |
... | ... | |
181 | 182 |
this.updateDate = updateDate; |
182 | 183 |
} |
183 | 184 |
|
184 |
public List<String> getManagers() { |
|
185 |
return managers; |
|
186 |
} |
|
187 |
|
|
188 |
public void setManagers(List<String> managers) { |
|
189 |
this.managers = managers; |
|
190 |
} |
|
191 |
|
|
192 | 185 |
public List<StringOrTopic> getTopics() { |
193 | 186 |
return topics; |
194 | 187 |
} |
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".