Revision 93ad7e54
Added by Andreas Müller over 4 years ago
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/SourcedEntityBase.java | ||
---|---|---|
28 | 28 |
import org.hibernate.annotations.CascadeType; |
29 | 29 |
import org.hibernate.envers.Audited; |
30 | 30 |
|
31 |
import eu.etaxonomy.cdm.model.reference.ICdmTarget; |
|
31 | 32 |
import eu.etaxonomy.cdm.model.reference.ISourceable; |
32 | 33 |
import eu.etaxonomy.cdm.model.reference.OriginalSourceBase; |
33 | 34 |
import eu.etaxonomy.cdm.model.reference.OriginalSourceType; |
... | ... | |
98 | 99 |
if (id == null && idNamespace == null && citation == null && microCitation == null){ |
99 | 100 |
return null; |
100 | 101 |
} |
101 |
SOURCE source = createNewSource(type, id, idNamespace, citation, microCitation, null); |
|
102 |
SOURCE source = createNewSource(type, id, idNamespace, citation, microCitation, null, null);
|
|
102 | 103 |
addSource(source); |
103 | 104 |
return source; |
104 | 105 |
} |
... | ... | |
109 | 110 |
if (reference == null && isBlank(microReference) && isBlank(originalInformation)){ |
110 | 111 |
return null; |
111 | 112 |
} |
112 |
SOURCE source = createNewSource(type, null, null, reference, microReference, originalInformation); |
|
113 |
SOURCE source = createNewSource(type, null, null, reference, microReference, originalInformation, null); |
|
114 |
addSource(source); |
|
115 |
return source; |
|
116 |
} |
|
117 |
|
|
118 |
@Override |
|
119 |
public SOURCE addAggregationSource(ICdmTarget target) { |
|
120 |
SOURCE source = createNewSource(OriginalSourceType.Aggregation, null, null, null, |
|
121 |
null, null, target); |
|
113 | 122 |
addSource(source); |
114 | 123 |
return source; |
115 | 124 |
} |
... | ... | |
129 | 138 |
if (id == null && idNamespace == null && citation == null && microCitation == null){ |
130 | 139 |
return null; |
131 | 140 |
} |
132 |
SOURCE source = createNewSource(OriginalSourceType.Import, id, idNamespace, citation, microCitation, null); |
|
141 |
SOURCE source = createNewSource(OriginalSourceType.Import, id, idNamespace, citation, microCitation, null, null);
|
|
133 | 142 |
addSource(source); |
134 | 143 |
return source; |
135 | 144 |
} |
... | ... | |
139 | 148 |
if (citation == null && microCitation == null){ |
140 | 149 |
return null; |
141 | 150 |
} |
142 |
SOURCE source = createNewSource(OriginalSourceType.PrimaryTaxonomicSource, null, null, citation, microCitation, null); |
|
151 |
SOURCE source = createNewSource(OriginalSourceType.PrimaryTaxonomicSource, null, null, citation, microCitation, null, null);
|
|
143 | 152 |
addSource(source); |
144 | 153 |
return source; |
145 | 154 |
} |
... | ... | |
174 | 183 |
} |
175 | 184 |
|
176 | 185 |
protected abstract SOURCE createNewSource(OriginalSourceType type, String idInSource, String idNamespace, |
177 |
Reference citation, String microReference, String originalInformation); |
|
186 |
Reference citation, String microReference, String originalInformation, ICdmTarget target);
|
|
178 | 187 |
|
179 | 188 |
//****************** CLONE ************************************************/ |
180 | 189 |
|
Also available in: Unified diff
fix #8673 Add CdmLinkSource to OriginalSourceBase