Revision b8601e0c
Added by Andreas Müller about 7 years ago
| eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java | ||
|---|---|---|
| 31 | 31 |
* |
| 32 | 32 |
* @author p.ciardelli |
| 33 | 33 |
* @created 25.06.2009 |
| 34 |
* @version 1.0 |
|
| 35 | 34 |
*/ |
| 36 | 35 |
public class ReferenceEditorInput extends AbstractBulkEditorInput<Reference> {
|
| 37 | 36 |
|
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/AbstractGroupedContainer.java | ||
|---|---|---|
| 48 | 48 |
|
| 49 | 49 |
import eu.etaxonomy.cdm.common.CdmUtils; |
| 50 | 50 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 51 |
import eu.etaxonomy.cdm.model.name.INonViralName; |
|
| 51 | 52 |
import eu.etaxonomy.cdm.model.name.NameRelationship; |
| 52 | 53 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 53 | 54 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| ... | ... | |
| 176 | 177 |
// parse the text |
| 177 | 178 |
String text = nameViewer.getTextWidget().getText(); |
| 178 | 179 |
|
| 179 |
NonViralName name = parseHandler.parse(text);
|
|
| 180 |
TaxonNameBase<?,?> name = (TaxonNameBase<?,?>)parseHandler.parse(text);
|
|
| 180 | 181 |
getTaxonBase().setName(name); |
| 181 | 182 |
getTaxonBase().setTitleCache((getTaxonBase().generateTitle())); |
| 182 | 183 |
|
| ... | ... | |
| 546 | 547 |
// @Override |
| 547 | 548 |
// protected IStatus run(IProgressMonitor monitor) {
|
| 548 | 549 |
// |
| 549 |
final NonViralName name = parseHandler
|
|
| 550 |
final TaxonNameBase<?,?> name = (TaxonNameBase<?,?>)parseHandler
|
|
| 550 | 551 |
.parseAndResolveDuplicates(unparsedNameString); |
| 551 | 552 |
// |
| 552 | 553 |
// Display.getDefault().asyncExec(new Runnable(){
|
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/CreateHomotypicSynonymHandler.java | ||
|---|---|---|
| 16 | 16 |
import org.eclipse.core.commands.common.NotDefinedException; |
| 17 | 17 |
|
| 18 | 18 |
import eu.etaxonomy.cdm.model.name.HomotypicalGroup; |
| 19 |
import eu.etaxonomy.cdm.model.name.INonViralName; |
|
| 19 | 20 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 21 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
|
| 20 | 22 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| 21 | 23 |
import eu.etaxonomy.taxeditor.editor.EditorUtil; |
| 22 | 24 |
import eu.etaxonomy.taxeditor.editor.Page; |
| ... | ... | |
| 46 | 48 |
Page.NAME); |
| 47 | 49 |
Taxon taxon = editor.getTaxon(); |
| 48 | 50 |
HomotypicalGroup group = taxon.getHomotypicGroup(); |
| 49 |
NonViralName newSynonymName = ParseHandler.createEmptyName();
|
|
| 51 |
TaxonNameBase<?,?> newSynonymName = ParseHandler.createEmptyName();
|
|
| 50 | 52 |
|
| 51 | 53 |
AbstractPostOperation operation; |
| 52 | 54 |
try {
|
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/CreateSynonymInHomotypicalGroupHandler.java | ||
|---|---|---|
| 20 | 20 |
import org.eclipse.ui.handlers.HandlerUtil; |
| 21 | 21 |
|
| 22 | 22 |
import eu.etaxonomy.cdm.model.name.HomotypicalGroup; |
| 23 |
import eu.etaxonomy.cdm.model.name.INonViralName; |
|
| 23 | 24 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 25 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
|
| 24 | 26 |
import eu.etaxonomy.cdm.model.taxon.Synonym; |
| 25 | 27 |
import eu.etaxonomy.taxeditor.editor.EditorUtil; |
| 26 | 28 |
import eu.etaxonomy.taxeditor.editor.Page; |
| ... | ... | |
| 62 | 64 |
|
| 63 | 65 |
HomotypicalGroup group = synonym.getHomotypicGroup(); |
| 64 | 66 |
|
| 65 |
NonViralName newSynonymName = ParseHandler.createEmptyName();
|
|
| 67 |
TaxonNameBase<?,?> newSynonymName = ParseHandler.createEmptyName();
|
|
| 66 | 68 |
|
| 67 | 69 |
AbstractPostOperation operation; |
| 68 | 70 |
|
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInExistingHomotypicalGroupOperation.java | ||
|---|---|---|
| 16 | 16 |
import org.eclipse.core.runtime.IStatus; |
| 17 | 17 |
|
| 18 | 18 |
import eu.etaxonomy.cdm.model.name.HomotypicalGroup; |
| 19 |
import eu.etaxonomy.cdm.model.name.INonViralName; |
|
| 19 | 20 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 21 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
|
| 20 | 22 |
import eu.etaxonomy.cdm.model.taxon.Synonym; |
| 21 | 23 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
| 22 | 24 |
import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation; |
| ... | ... | |
| 32 | 34 |
AbstractPostTaxonOperation {
|
| 33 | 35 |
|
| 34 | 36 |
private final HomotypicalGroup group; |
| 35 |
private final NonViralName newSynonymName;
|
|
| 37 |
private final TaxonNameBase<?,?> newSynonymName;
|
|
| 36 | 38 |
|
| 37 | 39 |
private Synonym synonym; |
| 38 | 40 |
|
| ... | ... | |
| 47 | 49 |
* @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
|
| 48 | 50 |
*/ |
| 49 | 51 |
public CreateSynonymInExistingHomotypicalGroupOperation(String label, |
| 50 |
IUndoContext undoContext, Taxon taxon, HomotypicalGroup group, NonViralName newSynonymName, IPostOperationEnabled postOperationEnabled) {
|
|
| 52 |
IUndoContext undoContext, Taxon taxon, HomotypicalGroup group, |
|
| 53 |
TaxonNameBase<?,?> newSynonymName, IPostOperationEnabled postOperationEnabled) {
|
|
| 51 | 54 |
super(label, undoContext, taxon, postOperationEnabled); |
| 52 | 55 |
this.group = group; |
| 53 | 56 |
this.newSynonymName = newSynonymName; |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java | ||
|---|---|---|
| 8 | 8 |
|
| 9 | 9 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 10 | 10 |
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase; |
| 11 |
import eu.etaxonomy.cdm.model.name.INonViralName; |
|
| 12 |
import eu.etaxonomy.cdm.model.name.ITaxonNameBase; |
|
| 11 | 13 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 12 | 14 |
import eu.etaxonomy.cdm.model.name.Rank; |
| 13 | 15 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
| ... | ... | |
| 47 | 49 |
/** |
| 48 | 50 |
* The name that should get parsed |
| 49 | 51 |
*/ |
| 50 |
private NonViralName name; |
|
| 52 |
private INonViralName name;
|
|
| 51 | 53 |
|
| 52 | 54 |
private boolean doResolveInReferences; |
| 53 | 55 |
|
| ... | ... | |
| 99 | 101 |
return name; |
| 100 | 102 |
} |
| 101 | 103 |
|
| 102 |
public static NonViralName parseName(String unparsedNameString, Rank rank){
|
|
| 103 |
NonViralName name = nonViralNameParser.parseFullName(unparsedNameString, |
|
| 104 |
public static TaxonNameBase<?,?> parseName(String unparsedNameString, Rank rank){
|
|
| 105 |
INonViralName name = nonViralNameParser.parseFullName(unparsedNameString,
|
|
| 104 | 106 |
PreferencesUtil.getPreferredNomenclaturalCode(), rank); |
| 105 |
|
|
| 106 |
return name; |
|
| 107 |
|
|
| 108 |
return (TaxonNameBase<?,?>)name;
|
|
| 107 | 109 |
} |
| 108 | 110 |
|
| 109 | 111 |
/** |
| ... | ... | |
| 112 | 114 |
* |
| 113 | 115 |
* @return a {@link eu.etaxonomy.cdm.model.name.TaxonNameBase} object.
|
| 114 | 116 |
*/ |
| 115 |
public static NonViralName createEmptyName(){
|
|
| 116 |
return nonViralNameParser.getNonViralNameInstance("", PreferencesUtil.getPreferredNomenclaturalCode());
|
|
| 117 |
public static TaxonNameBase<?,?> createEmptyName(){
|
|
| 118 |
return (TaxonNameBase<?,?>)nonViralNameParser.getNonViralNameInstance("", PreferencesUtil.getPreferredNomenclaturalCode());
|
|
| 117 | 119 |
} |
| 118 | 120 |
|
| 119 | 121 |
/** |
| ... | ... | |
| 122 | 124 |
* |
| 123 | 125 |
* @return The parsed NonViralName object |
| 124 | 126 |
*/ |
| 125 |
public NonViralName parse(String unparsedNameString){
|
|
| 127 |
public INonViralName parse(String unparsedNameString){
|
|
| 126 | 128 |
|
| 127 | 129 |
// String unparsedNameString = ""; |
| 128 | 130 |
// try {
|
| ... | ... | |
| 156 | 158 |
* |
| 157 | 159 |
* @return The parsed NonViralName object |
| 158 | 160 |
*/ |
| 159 |
public NonViralName parseAndResolveDuplicates(String unparsedNameString){
|
|
| 161 |
public INonViralName parseAndResolveDuplicates(String unparsedNameString){
|
|
| 160 | 162 |
|
| 161 |
NonViralName parsedName = parse(unparsedNameString); |
|
| 163 |
INonViralName parsedName = parse(unparsedNameString);
|
|
| 162 | 164 |
|
| 163 | 165 |
MatchMatrix matchMatrix = findMatches(parsedName); |
| 164 | 166 |
|
| ... | ... | |
| 173 | 175 |
/** |
| 174 | 176 |
* @param name The name to resolve duplicates for. |
| 175 | 177 |
*/ |
| 176 |
private void resolveDuplicates(NonViralName name, MatchMatrix matchMatrix) {
|
|
| 178 |
private void resolveDuplicates(INonViralName name, MatchMatrix matchMatrix) {
|
|
| 177 | 179 |
resolveDuplicateNames(name, matchMatrix); |
| 178 | 180 |
|
| 179 | 181 |
resolveAllDuplicateAuthors(name, matchMatrix); |
| ... | ... | |
| 189 | 191 |
/** |
| 190 | 192 |
* @param name The name to resolve duplicates for. |
| 191 | 193 |
*/ |
| 192 |
private void resolveDuplicateNames(NonViralName name, MatchMatrix matchMatrix) {
|
|
| 194 |
private void resolveDuplicateNames(INonViralName name, MatchMatrix matchMatrix) {
|
|
| 193 | 195 |
|
| 194 | 196 |
if (matchMatrix.duplicateNames.size() == 1){
|
| 195 |
name = (NonViralName) matchMatrix.duplicateNames.iterator().next();
|
|
| 197 |
name = matchMatrix.duplicateNames.iterator().next(); |
|
| 196 | 198 |
}else if(matchMatrix.duplicateNames.size() > 1){
|
| 197 | 199 |
// FIXME TODO resolve multiple duplications. Use first match for a start |
| 198 |
name = (NonViralName) matchMatrix.duplicateNames.iterator().next();
|
|
| 200 |
name = matchMatrix.duplicateNames.iterator().next(); |
|
| 199 | 201 |
} |
| 200 | 202 |
} |
| 201 | 203 |
|
| 202 | 204 |
/** |
| 203 | 205 |
* @param name The name to resolve duplicates for. |
| 204 | 206 |
*/ |
| 205 |
private void resolveDuplicateReferences(NonViralName name, MatchMatrix matchMatrix) {
|
|
| 207 |
private void resolveDuplicateReferences(INonViralName name, MatchMatrix matchMatrix) {
|
|
| 206 | 208 |
if(matchMatrix.duplicateReferences.size() == 1){
|
| 207 | 209 |
// exactly one match. We assume that the user wants this reference |
| 208 | 210 |
INomenclaturalReference duplicate = matchMatrix.duplicateReferences.iterator().next(); |
| ... | ... | |
| 217 | 219 |
/** |
| 218 | 220 |
* @param name The name to resolve duplicates for. |
| 219 | 221 |
*/ |
| 220 |
private void resolveDuplicateInReferences(NonViralName name, MatchMatrix matchMatrix) {
|
|
| 222 |
private void resolveDuplicateInReferences(INonViralName name, MatchMatrix matchMatrix) {
|
|
| 221 | 223 |
Reference reference = (Reference) HibernateProxyHelper.deproxy(name.getNomenclaturalReference()); |
| 222 | 224 |
|
| 223 | 225 |
if(matchMatrix.duplicateInReferences.size() > 0){
|
| ... | ... | |
| 233 | 235 |
/** |
| 234 | 236 |
* @param name The name to resolve duplicates for. |
| 235 | 237 |
*/ |
| 236 |
private void resolveAllDuplicateAuthors(NonViralName name, MatchMatrix matchMatrix) {
|
|
| 238 |
private void resolveAllDuplicateAuthors(INonViralName name, MatchMatrix matchMatrix) {
|
|
| 237 | 239 |
|
| 238 | 240 |
if(matchMatrix.duplicateCombinationAuthorships.size() > 0){
|
| 239 | 241 |
name.setCombinationAuthorship(matchMatrix.duplicateCombinationAuthorships.iterator().next()); |
| ... | ... | |
| 266 | 268 |
* |
| 267 | 269 |
* @param name The NonViralName to find matches for. |
| 268 | 270 |
*/ |
| 269 |
private MatchMatrix findMatches(NonViralName name){
|
|
| 271 |
private MatchMatrix findMatches(INonViralName name){
|
|
| 270 | 272 |
|
| 271 | 273 |
MatchMatrix matchMatrix = new MatchMatrix(); |
| 272 | 274 |
|
| ... | ... | |
| 335 | 337 |
* @param taxonNameBase The TaxonNameBase to find matches for. |
| 336 | 338 |
* @return A <code>List</code> of possibly matching TaxonNameBase's. |
| 337 | 339 |
*/ |
| 338 |
private List<TaxonNameBase> findMatchingLatinNames(TaxonNameBase taxonNameBase) {
|
|
| 340 |
private List<TaxonNameBase> findMatchingLatinNames(ITaxonNameBase taxonNameBase) {
|
|
| 339 | 341 |
|
| 340 | 342 |
try {
|
| 341 | 343 |
|
| 342 |
return CdmStore.getCommonService().findMatching(taxonNameBase, MatchStrategy.NonViralName);
|
|
| 344 |
return CdmStore.getCommonService().findMatching(TaxonNameBase.castAndDeproxy(taxonNameBase), MatchStrategy.NonViralName);
|
|
| 343 | 345 |
|
| 344 | 346 |
|
| 345 | 347 |
} catch (MatchException e) {
|
Also available in: Unified diff
ref #6362 remove occurrences of NonViralName in code and some cleanup