Revision 3986faa0
Added by Andreas Müller over 5 years ago
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/CdmPreference.java | ||
---|---|---|
56 | 56 |
private static final long serialVersionUID = 4307599154287181582L; |
57 | 57 |
|
58 | 58 |
public static final CdmPreference NewInstance(PreferenceSubject subject, |
59 |
IPreferencePredicate predicate, String value){ |
|
59 |
IPreferencePredicate<?> predicate, String value){
|
|
60 | 60 |
return new CdmPreference(subject, predicate, value); |
61 | 61 |
} |
62 | 62 |
|
63 | 63 |
|
64 |
public static final CdmPreference NewInstance(PreferenceSubject subject, IPreferencePredicate predicate, List<UUID> value){ |
|
64 |
public static final CdmPreference NewInstance(PreferenceSubject subject, IPreferencePredicate<?> predicate, List<UUID> value){
|
|
65 | 65 |
return new CdmPreference(subject, predicate, uuidListStr(value)); |
66 | 66 |
} |
67 |
public static final CdmPreference NewInstance(PreferenceSubject subject, IPreferencePredicate predicate, UUID ... value){ |
|
67 |
public static final CdmPreference NewInstance(PreferenceSubject subject, IPreferencePredicate<?> predicate, UUID ... value){
|
|
68 | 68 |
return new CdmPreference(subject, predicate, uuidListStr(Arrays.asList(value))); |
69 | 69 |
} |
70 | 70 |
|
71 |
public static final CdmPreference NewInstance(PreferenceSubject subject, IPreferencePredicate predicate, UUID value){ |
|
71 |
public static final CdmPreference NewInstance(PreferenceSubject subject, IPreferencePredicate<?> predicate, UUID value){
|
|
72 | 72 |
return new CdmPreference(subject, predicate, value.toString()); |
73 | 73 |
} |
74 | 74 |
|
... | ... | |
77 | 77 |
* @param value |
78 | 78 |
* @return |
79 | 79 |
*/ |
80 |
public static CdmPreference NewDatabaseInstance(IPreferencePredicate predicate, String value) { |
|
80 |
public static CdmPreference NewDatabaseInstance(IPreferencePredicate<?> predicate, String value) {
|
|
81 | 81 |
return new CdmPreference(PreferenceSubject.NewDatabaseInstance(), predicate, value); |
82 | 82 |
} |
83 | 83 |
|
... | ... | |
86 | 86 |
* @param value |
87 | 87 |
* @return |
88 | 88 |
*/ |
89 |
public static CdmPreference NewVaadinInstance(IPreferencePredicate predicate, String value) { |
|
89 |
public static CdmPreference NewVaadinInstance(IPreferencePredicate<?> predicate, String value) {
|
|
90 | 90 |
return new CdmPreference(PreferenceSubject.NewVaadinInstance(), predicate, value); |
91 | 91 |
} |
92 | 92 |
|
... | ... | |
95 | 95 |
* @param value |
96 | 96 |
* @return |
97 | 97 |
*/ |
98 |
public static CdmPreference NewTaxEditorInstance(IPreferencePredicate predicate, String value) { |
|
98 |
public static CdmPreference NewTaxEditorInstance(IPreferencePredicate<?> predicate, String value) {
|
|
99 | 99 |
return new CdmPreference(PreferenceSubject.NewTaxEditorInstance(), predicate, value); |
100 | 100 |
} |
101 | 101 |
|
102 |
public static PrefKey NewKey(PreferenceSubject subject, IPreferencePredicate predicate){ |
|
102 |
public static PrefKey NewKey(PreferenceSubject subject, IPreferencePredicate<?> predicate){
|
|
103 | 103 |
return new PrefKey(subject, predicate); |
104 | 104 |
} |
105 | 105 |
|
... | ... | |
139 | 139 |
//for hibernate use only |
140 | 140 |
private PrefKey(){} |
141 | 141 |
|
142 |
private PrefKey(PreferenceSubject subject, IPreferencePredicate predicate){ |
|
142 |
private PrefKey(PreferenceSubject subject, IPreferencePredicate<?> predicate){
|
|
143 | 143 |
this(subject.toString(), predicate.getKey()); |
144 | 144 |
} |
145 | 145 |
// private PrefKey(PreferenceSubjectEnum subject, PreferencePredicate predicate){ |
... | ... | |
210 | 210 |
private CdmPreference(){} |
211 | 211 |
|
212 | 212 |
|
213 |
private CdmPreference(PreferenceSubject subject, IPreferencePredicate predicate, String value){ |
|
213 |
private CdmPreference(PreferenceSubject subject, IPreferencePredicate<?> predicate, String value){
|
|
214 | 214 |
this.key = new PrefKey(subject, predicate); |
215 | 215 |
//TODO are null values allowed? assert predicate != null : "value must not be null for preference"; |
216 | 216 |
if (value != null && value.length() > 1023) {throw new IllegalArgumentException( |
Also available in: Unified diff
cleanup