Project

General

Profile

Revision c0f42391

IDc0f42391f99af86366c0e4196b8cfd79f9756bca
Parent 43a34efe
Child f37e7436

Added by Katja Luther about 3 years ago

fix problems for taxEditor preferences

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/CdmPreference.java
156 156
            if (predicate.length() > 255) {
157 157
                throw new IllegalArgumentException("Predicate must not be longer then 255 for preference");
158 158
            }
159
            if (!subject.matches(PreferenceSubject.ROOT + "(([A-Za-z]+\\[.*\\]|"+PreferenceSubject.VAADIN+")"+PreferenceSubject.SEP+")?")){
159
            if (!(subject.matches(PreferenceSubject.ROOT + "(([A-Za-z]+\\[.*\\]|"+PreferenceSubject.VAADIN+")"+PreferenceSubject.SEP+")?") || subject.matches(PreferenceSubject.ROOT + "(([A-Za-z]+\\[.*\\]|"+PreferenceSubject.TAX_EDITOR+")"+PreferenceSubject.SEP+")?"))){
160 160
                throw new IllegalArgumentException("Subject does not follow the required syntax");
161 161
            }
162 162

  
163 163

  
164

  
164 165
            this.subject = subject;
165 166
            this.predicate = predicate;
166 167
        }

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)