Revision 2d308550
Added by Andreas Müller over 5 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java | ||
|---|---|---|
| 98 | 98 |
@Inheritance(strategy=InheritanceType.SINGLE_TABLE) |
| 99 | 99 |
public abstract class DescriptionElementBase extends AnnotatableEntity |
| 100 | 100 |
implements ISourceable<DescriptionElementSource>, IModifiable, IMultiLanguageTextHolder{
|
| 101 |
|
|
| 101 | 102 |
private static final long serialVersionUID = 5000910777835755905L; |
| 102 | 103 |
@SuppressWarnings("unused")
|
| 103 | 104 |
private static final Logger logger = Logger.getLogger(DescriptionElementBase.class); |
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ITaxonNameBase.java | ||
|---|---|---|
| 421 | 421 |
* @see NameTypeDesignation |
| 422 | 422 |
* @see SpecimenTypeDesignation |
| 423 | 423 |
*/ |
| 424 |
public Set<TypeDesignationBase<?>> getTypeDesignations();
|
|
| 424 |
public Set<TypeDesignationBase> getTypeDesignations(); |
|
| 425 | 425 |
|
| 426 | 426 |
/** |
| 427 | 427 |
* Removes one element from the set of {@link TypeDesignationBase type designations} assigned to
|
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonName.java | ||
|---|---|---|
| 66 | 66 |
import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor; |
| 67 | 67 |
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase; |
| 68 | 68 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
| 69 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase; |
|
| 69 | 70 |
import eu.etaxonomy.cdm.model.common.IIntextReferenceTarget; |
| 70 | 71 |
import eu.etaxonomy.cdm.model.common.IParsable; |
| 71 | 72 |
import eu.etaxonomy.cdm.model.common.IRelated; |
| ... | ... | |
| 73 | 74 |
import eu.etaxonomy.cdm.model.common.OriginalSourceType; |
| 74 | 75 |
import eu.etaxonomy.cdm.model.common.RelationshipBase; |
| 75 | 76 |
import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction; |
| 77 |
import eu.etaxonomy.cdm.model.common.TermType; |
|
| 78 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
|
| 76 | 79 |
import eu.etaxonomy.cdm.model.description.DescriptionElementSource; |
| 77 | 80 |
import eu.etaxonomy.cdm.model.description.IDescribable; |
| 78 | 81 |
import eu.etaxonomy.cdm.model.description.TaxonNameDescription; |
| ... | ... | |
| 268 | 271 |
) |
| 269 | 272 |
@Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
|
| 270 | 273 |
@NotNull |
| 271 |
private Set<TypeDesignationBase<?>> typeDesignations = new HashSet<>();
|
|
| 274 |
private Set<TypeDesignationBase> typeDesignations = new HashSet<>(); |
|
| 272 | 275 |
|
| 273 | 276 |
@XmlElement(name = "HomotypicalGroup") |
| 274 | 277 |
@XmlIDREF |
| ... | ... | |
| 2441 | 2444 |
* @see SpecimenTypeDesignation |
| 2442 | 2445 |
*/ |
| 2443 | 2446 |
@Override |
| 2444 |
public Set<TypeDesignationBase<?>> getTypeDesignations() {
|
|
| 2447 |
public Set<TypeDesignationBase> getTypeDesignations() {
|
|
| 2445 | 2448 |
if(typeDesignations == null) {
|
| 2446 | 2449 |
this.typeDesignations = new HashSet<>(); |
| 2447 | 2450 |
} |
| cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestModelUpdate.java | ||
|---|---|---|
| 133 | 133 |
*/ |
| 134 | 134 |
@SuppressWarnings("unused") //enable only if needed
|
| 135 | 135 |
private void updateRemoteWebappTestH2(){
|
| 136 |
String pathToProject = "C:\\Users\\a.mueller\\eclipse\\git\\cdmlib\\cdmlib-remote-webapp\\"; |
|
| 137 |
// String pathToProject = "C:\\Users\\a.mueller\\eclipse\\git\\cdm-vaadin\\";
|
|
| 136 |
// String pathToProject = "C:\\Users\\a.mueller\\eclipse\\git\\cdmlib\\cdmlib-remote-webapp\\";
|
|
| 137 |
String pathToProject = "C:\\Users\\a.mueller\\eclipse\\git\\cdm-vaadin\\"; |
|
| 138 | 138 |
// String pathToProject = "C:\\Users\\a.mueller\\eclipse\\git\\taxeditor2\\eu.etaxonomy.taxeditor.test\\"; |
| 139 | 139 |
|
| 140 | 140 |
String pathInProject = "src\\test\\resources\\h2"; |
| ... | ... | |
| 191 | 191 |
System.out.println("Start TestModelUpdate");
|
| 192 | 192 |
testSelectedDb(); |
| 193 | 193 |
|
| 194 |
// updateRemoteWebappTestH2(); //also updates vaadin and taxedtior model
|
|
| 194 |
// updateRemoteWebappTestH2(); //also updates vaadin and taxeditor model
|
|
| 195 | 195 |
// updateEdaphobasePostgres(); |
| 196 |
|
|
| 196 | 197 |
System.out.println("\nEnd Datasource");
|
| 197 | 198 |
} |
| 198 | 199 |
|
| cdmlib-test/src/main/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd | ||
|---|---|---|
| 954 | 954 |
REVTYPE CDATA #IMPLIED |
| 955 | 955 |
> |
| 956 | 956 |
|
| 957 |
|
|
| 958 |
<!ELEMENT DEFINEDTERMBASE_INVERSEREPRESENTATION EMPTY> |
|
| 959 |
<!ATTLIST DEFINEDTERMBASE_INVERSEREPRESENTATION |
|
| 960 |
DEFINEDTERMBASE_ID CDATA #REQUIRED |
|
| 961 |
INVERSEREPRESENTATIONS_ID CDATA #REQUIRED |
|
| 962 |
> |
|
| 963 |
|
|
| 964 |
<!ELEMENT DEFINEDTERMBASE_INVERSEREPRESENTATION_AUD EMPTY> |
|
| 965 |
<!ATTLIST DEFINEDTERMBASE_INVERSEREPRESENTATION_AUD |
|
| 966 |
REV CDATA #REQUIRED |
|
| 967 |
DEFINEDTERMBASE_ID CDATA #REQUIRED |
|
| 968 |
INVERSEREPRESENTATIONS_ID CDATA #REQUIRED |
|
| 969 |
REVTYPE CDATA #IMPLIED |
|
| 970 |
> |
|
| 971 |
|
|
| 957 | 972 |
<!ELEMENT DEFINEDTERMBASE_STATISTICALMEASURE EMPTY> |
| 958 | 973 |
<!ATTLIST DEFINEDTERMBASE_STATISTICALMEASURE |
| 959 | 974 |
DEFINEDTERMBASE_ID CDATA #REQUIRED |
| ... | ... | |
| 2598 | 2613 |
REVTYPE CDATA #IMPLIED |
| 2599 | 2614 |
> |
| 2600 | 2615 |
|
| 2601 |
<!ELEMENT DEFINEDTERMBASE_INVERSEREPRESENTATION EMPTY> |
|
| 2602 |
<!ATTLIST DEFINEDTERMBASE_INVERSEREPRESENTATION |
|
| 2603 |
DEFINEDTERMBASE_ID CDATA #REQUIRED |
|
| 2604 |
INVERSEREPRESENTATIONS_ID CDATA #REQUIRED |
|
| 2605 |
> |
|
| 2606 |
|
|
| 2607 |
<!ELEMENT DEFINEDTERMBASE_INVERSEREPRESENTATION_AUD EMPTY> |
|
| 2608 |
<!ATTLIST DEFINEDTERMBASE_INVERSEREPRESENTATION_AUD |
|
| 2609 |
REV CDATA #REQUIRED |
|
| 2610 |
DEFINEDTERMBASE_ID CDATA #REQUIRED |
|
| 2611 |
INVERSEREPRESENTATIONS_ID CDATA #REQUIRED |
|
| 2612 |
REVTYPE CDATA #IMPLIED |
|
| 2613 |
> |
|
| 2614 | 2616 |
|
| 2615 | 2617 |
<!ELEMENT REPRESENTATION EMPTY> |
| 2616 | 2618 |
<!ATTLIST REPRESENTATION |
Also available in: Unified diff
cleanup