Revision e5668830
Added by Andreas Müller over 6 years ago
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/CdmPreference.java | ||
---|---|---|
56 | 56 |
} |
57 | 57 |
|
58 | 58 |
/** |
59 |
* @param test |
|
60 |
* @param string |
|
59 |
* @param predicate |
|
60 |
* @param value |
|
61 |
* @return |
|
62 |
*/ |
|
63 |
public static CdmPreference NewDatabaseInstance(PreferencePredicate predicate, String value) { |
|
64 |
return new CdmPreference(PreferenceSubject.NewDatabaseInstance(), predicate, value); |
|
65 |
} |
|
66 |
|
|
67 |
/** |
|
68 |
* @param predicate |
|
69 |
* @param value |
|
61 | 70 |
* @return |
62 | 71 |
*/ |
63 |
public static CdmPreference NewDatabaseInstance(PreferencePredicate test, String value) {
|
|
64 |
return new CdmPreference(PreferenceSubject.NewDatabaseInstance(), test, value);
|
|
72 |
public static CdmPreference NewVaadinInstance(PreferencePredicate predicate, String value) {
|
|
73 |
return new CdmPreference(PreferenceSubject.NewVaadinInstance(), predicate, value);
|
|
65 | 74 |
} |
66 | 75 |
|
67 | 76 |
public static PrefKey NewKey(PreferenceSubject subject, PreferencePredicate predicate){ |
... | ... | |
124 | 133 |
if (predicate.length() > 255) { |
125 | 134 |
throw new IllegalArgumentException("Predicate must not be longer then 255 for preference"); |
126 | 135 |
} |
127 |
if (!subject.matches("/([A-Za-z]+\\[.*\\])?")){
|
|
128 |
throw new IllegalArgumentException("Predicate does not follow the required syntax");
|
|
136 |
if (!subject.matches(PreferenceSubject.ROOT + "(([A-Za-z]+\\[.*\\]|"+PreferenceSubject.VAADIN+")"+PreferenceSubject.SEP+")?")){
|
|
137 |
throw new IllegalArgumentException("Subject does not follow the required syntax");
|
|
129 | 138 |
} |
130 | 139 |
|
131 | 140 |
|
Also available in: Unified diff
ref #6903 preferences for vaadin