Project

General

Profile

« Previous | Next » 

Revision a58f31a1

Added by Andreas Kohlbecker about 5 years ago

Revert "ref #7899 adding MarkerType 'Incorrect name'"

This reverts commit 068197fd8dc908bd5c05ddd764e78027a564dbec.

View differences:

src/main/java/eu/etaxonomy/cdm/dataInserter/RegistrationRequiredDataInserter.java
34 34
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
35 35
import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
36 36
import eu.etaxonomy.cdm.model.common.Group;
37
import eu.etaxonomy.cdm.model.common.MarkerType;
38 37
import eu.etaxonomy.cdm.model.common.TermVocabulary;
39 38
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
40 39
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
......
49 48
import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmPermissionClass;
50 49
import eu.etaxonomy.cdm.persistence.hibernate.permission.Role;
51 50
import eu.etaxonomy.cdm.vaadin.model.registration.KindOfUnitTerms;
52
import eu.etaxonomy.cdm.vaadin.model.registration.RegistrationMarkerTypes;
53 51
import eu.etaxonomy.cdm.vaadin.permission.RolesAndPermissions;
54 52

  
55 53
///*
......
192 190
            }
193 191
        }
194 192

  
195
        DefinedTermBase incorrectName = repo.getTermService().find(RegistrationMarkerTypes.INCORRECT_NAME().getUuid());
196
        if(incorrectName == null){
197
            incorrectName = repo.getTermService().save(RegistrationMarkerTypes.INCORRECT_NAME());
198
            MarkerType.COMPLETE().getVocabulary().addTerm((MarkerType) incorrectName);
199
        }
200

  
201 193
        repo.commitTransaction(txStatus);
202 194

  
203 195
    }
src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/RegistrationMarkerTypes.java
1
/**
2
* Copyright (C) 2017 EDIT
3
* European Distributed Institute of Taxonomy
4
* http://www.e-taxonomy.eu
5
*
6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7
* See LICENSE.TXT at the top of this package for the full license terms.
8
*/
9
package eu.etaxonomy.cdm.vaadin.model.registration;
10

  
11
import java.util.UUID;
12

  
13
import eu.etaxonomy.cdm.model.common.MarkerType;
14

  
15
/**
16
 * RegistrationMarkerTypes specific to the phycobank project
17
 *
18
 * @author a.kohlbecker
19
 * @since Jun 20, 2017
20
 *
21
 */
22
public class RegistrationMarkerTypes {
23

  
24
    private static final UUID UUID_INCORRECT_NAME = UUID.fromString("a5ba6418-11a8-4284-b879-5d53d631010a");
25

  
26
    private static MarkerType incorrect_name = null;
27

  
28
    public static MarkerType INCORRECT_NAME() {
29
        if(incorrect_name == null){
30
            incorrect_name = MarkerType.NewInstance("Incorrect name", "Incorrect name", "Incorr.");
31
            incorrect_name.setUuid(UUID_INCORRECT_NAME);
32
        }
33
        return incorrect_name;
34
    }
35
}

Also available in: Unified diff