refactoring CdmApplicationConfiguration/Controller to allow for remoting

CdmStoreConnector : added application configuration call for remoting (currently commented)

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
index eb74e5e7504d89fc8c7a57738ac4b4f27fe61207..1105555db60adf237d0afa48ff895f51b6ef14d1 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
@@ -20,9 +20,13 @@ import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.handlers.HandlerUtil;
 import org.eclipse.ui.texteditor.IDocumentProvider;
 
+import eu.etaxonomy.cdm.api.service.IGroupService;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.api.service.IReferenceService;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
+import eu.etaxonomy.cdm.api.service.IUserService;
+import eu.etaxonomy.cdm.model.common.Group;
+import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
@@ -83,6 +87,12 @@ public class DeleteHandler extends AbstractHandler {
                                                } else if (object instanceof Reference){
                                                        IReferenceService service = controller.getReferenceService();
                                                        service.delete((Reference)object);
+                                               } else if (object instanceof Group){
+                                                       IGroupService service = controller.getGroupService();
+                                                       service.delete((Group) object);
+                                               }else if (object instanceof User){
+                                                       IUserService service = controller.getUserService();
+                                                       service.delete((User) object);
                                                }
                                                
                                        } catch (Exception e){

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientTaxonService.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientTaxonService.java
index 587b20bbbbabc06d99bf1d7100d2b9329808a18e..b78da64c1e966470030f23d818515b27241719c9 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientTaxonService.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientTaxonService.java
@@ -1394,6 +1394,18 @@ public class TransientTaxonService implements ITaxonService {
         return defaultTaxonService.getSynonymsByHomotypicGroup(taxon, propertyPaths);
     }
 
+       @Override
+       public Synonym changeRelatedTaxonToSynonym(Taxon fromTaxon, Taxon toTaxon,
+                       TaxonRelationshipType oldRelationshipType,
+                       SynonymRelationshipType synonymRelationshipType)
+                       throws DataChangeNoRollbackException {
+               
+               return defaultTaxonService.changeRelatedTaxonToSynonym(fromTaxon, toTaxon, oldRelationshipType, synonymRelationshipType);
+       }
+
+    
+
+       
 
 
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
index 6bfcead6dcd609534c42e178511fc509d0152f4a..b0428d5bc511cf107fe2896d9aa8a14e82725e6e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
@@ -9,9 +9,7 @@
 
 package eu.etaxonomy.taxeditor.editor;
 
-import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
@@ -117,7 +115,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
        else if(taxonBase.isInstanceOf(Taxon.class)){
                Taxon taxon = CdmBase.deproxy(taxonBase, Taxon.class);
 
-               if (taxon.isMisapplication()){
+               if (taxon.getTaxonNodes().size() == 0 && taxon.isMisapplication()){
                        // TODO get accepted taxon
                        EditorUtil.info("trying to open Mispplied Name ");
 
@@ -324,426 +322,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe
         * @return the taxon
         */
        public Taxon getTaxon(){
-               
-                       List<String> TAXON_INIT_STRATEGY = Arrays.asList(new String []{
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // VersionableEntity            : toOne-> "updated, updatedBy"
-                                       // AnnotatableEntity            : toMany-> "annotations, markers"
-                                       // IdentifiableEntity           : toMany-> "credits, extensions, rights, sources" 
-                                       //                                                      : toOne-> "lsid"
-                                       // TaxonBase                            : toOne-> "homotypicgroup, name, sec"
-                                       // Taxon                                        : toMany-> "descriptions, heterotypicSynonymyGroups, homotypicSynonymsByHomotypicGroup, homotypicSynonymsByHomotypicRelationship, homotypicSynonymyGroups, misappliedNames, relationsFromThisTaxon, relationsToThisTaxon, synonymNames, synonymRelations, synonyms, synonymsSortedByType, taxonNodes, taxonRelations"
-                                       //                                                      : toOne-> "imageGallery"
-                                       "*",
-
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // VersionableEntity            : toOne-> "updated, updatedBy"
-                                       // AnnotatableEntity            : toMany-> "" (available: "annotations, markers")
-                                       // LanguageStringBase           : toOne-> "language"
-                                       // Annotation                           : toOne-> "annotatedObj, annotationType, commentator, linkbackUrl
-                                       "annotations.$",
-
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // VersionableEntity            : toOne-> "updated, updatedBy"
-                                       // Marker                                       : toOne-> "markedObj, markerType"       
-                                       "markers.$",
-                                       "markers.markerType.$",
-
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // AnnotatableEntity            : toMany-> "" (available: "annotations, markers")
-                                       // LanguageStringBase           : toOne-> "language"
-                                       // Annotation                           : toOne-> "annotatedObj, annotationType, commentator, linkbackUrl
-                                       // Credit                                       : toOne-> "agent"       
-                                       "credits.$",
-
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // VersionableEntity            : toOne-> "updated, updatedBy"
-                                       // Extension                            : toOne-> "extendedObj, type"   
-                                       "extensions.$",
-                                       "extensions.type.$",
-
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // VersionableEntity            : toOne-> "updated, updatedBy"
-                                       // AnnotatableEntity            : toMany-> "" (available: "annotations, markers")
-                                       // LanguageStringBase           : toOne-> "language"
-                                       // Rights                                       : toOne-> "agent, type, uri"    
-                                       "rights.$",
-
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // VersionableEntity            : toOne-> "updated, updatedBy"
-                                       // AnnotatableEntity            : toMany-> "" (available: "annotations, markers")
-                                       // ReferencedEntityBase         : toOne-> "citation"    
-                                       // OriginalSourceBase           :       
-                                       // IdentifiableSource           : toOne-> "sourcedObj"  
-                                       "sources.$",
-
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // AnnotatableEntity            : toMany-> "" (available: "annotations, markers")
-                                       // HomotypicalGroup                     : toMany-> "" (available: "basionymAndReplacedSynonymRelations, basionyms, basionymsOrReplacedSynonyms, nameTypeDesignations, newCombinations, replacedSynonym, specimenTypeDesignations, synonymsInGroup, typeDesignations, typifiedNames, unrelatedNames" )  
-                                       "homotypicGroup.$",
-
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // AnnotatableEntity            : toMany-> "" (available: "annotations, markers")
-                                       // TaxonNameBase                        : toMany-> "" (available: "basionyms, descriptions, nameRelations, nameTypeDesignations, relationsFromThisName, relationsToThisName, specimenTypeDesignations, specimenTypeDesignationsOfHomotypicalGroup, status, synonyms, taggedName, taxa, taxonBases, typeDesignations" ) 
-                                       //                                                      : toOne-> "basionym, citation, homotypicalGroup, nomenclaturalCode, nomenclaturalReference, rank"
-                                       // ViralName 
-                                       // NonViralName                         : toMany->"" (available: "childRelationships, hybridChildRelations, hybridParentRelations, orderedChildRelationships, parentRelationships") 
-                                       //                                                      : toOne-> "basionymAuthorTeam, combinationAuthorTeam, exBasionymAuthorTeam, exCombinationAuthorTeam"
-                                       "name.$",
-
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // VersionableEntity            : toOne-> "updated, updatedBy"
-                                       // AnnotatableEntity            : toMany-> "annotations, markers"
-                                       // IdentifiableEntity           : toMany-> "credits, extensions, rights, sources" 
-                                       //                                                      : toOne-> "lsid"
-                                       // IdentifiableMediaEntity      : toMany->"" (available: "media") 
-                                       // Reference                            : toOne->"authorTeam, datePublished, inBook, inJournal, inProceedings, inReference, inSeries, institution, school, type, uri" 
-                                       "sec.$",
-                                       
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // AnnotatableEntity            : toMany-> "annotations, markers"
-                                       // IdentifiableEntity           : toMany-> "credits, extensions, rights, sources" 
-                                       //                                                      : toOne-> "lsid"
-                                       // DescriptionBase                      : toMany->"" (available: "describedSpecimenOrObservations, descriptiveSystem, elements, workingSets" )
-                                       // TaxonDescription                     : toMany->"" (available: "geoScopes, scopes" )
-                                       //                                                      : toOne-> "taxon"
-                                       "descriptions.$",
-
-                                       
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // VersionableEntity            : toOne-> "updated, updatedBy"
-                                       // AnnotatableEntity            : toMany-> "annotations, markers"
-                                       // ReferencedEntityBase         : toOne-> "citation"    
-                                       // RelationshipBase                     : 
-                                       // TaxonRelationship            : toOne->"fromTaxon, relatedFrom, relatedTo, toTaxon, type"
-                                       "relationsFromThisTaxon.$",
-
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // VersionableEntity            : toOne-> "updated, updatedBy"
-                                       // AnnotatableEntity            : toMany-> "annotations, markers"
-                                       // ReferencedEntityBase         : toOne-> "citation"    
-                                       // RelationshipBase                     : 
-                                       // TaxonRelationship            : toOne->"fromTaxon, relatedFrom, relatedTo, toTaxon, type"
-                                       "relationsToThisTaxon.$",
-
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // VersionableEntity            : toOne-> "updated, updatedBy"
-                                       // AnnotatableEntity            : toMany-> "annotations, markers"
-                                       // ReferencedEntityBase         : toOne-> "citation"    
-                                       // RelationshipBase                     : 
-                                       // SynonymRelationship          : toOne->"acceptedTaxon, relatedFrom, relatedTo, synonym, type"
-                                       "synonymRelations.$",
-
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // VersionableEntity            : toOne-> "updated, updatedBy"
-                                       // AnnotatableEntity            : toMany-> "annotations, markers"
-                                       // IdentifiableEntity           : toMany-> "credits, extensions, rights, sources" 
-                                       //                                                      : toOne-> "lsid"
-                                       // TaxonBase                            : toOne-> "homotypicgroup, name, sec"
-                                       // Synonym                                      : toMany-> "" (available: "acceptedTaxa, relationType, synonymRelations" )
-                                       "synonyms.$",
-
-
-                                       "misappliedNames.$",
-                                       "misappliedNames.name.extensions.type.$",
-                                       "misappliedNames.name.status.$",
-                                       "misappliedNames.name.status.type.$",
-                                       "misappliedNames.name.descriptions.elements.$",
-                                       "misappliedNames.name.typeDesignations.$",
-                                       "misappliedNames.name.typeDesignations.typeStatus.$",
-
-//                                     "relationsFromThisTaxon.fromTaxon.$",
-//                                     "relationsFromThisTaxon.fromTaxon.name.status.$",
-//                                     "relationsFromThisTaxon.fromTaxon.name.status.type.$",
-//                                     "relationsFromThisTaxon.fromTaxon.name.descriptions.elements.$",
-//                                     "relationsFromThisTaxon.fromTaxon.name.typeDesignations.typeStatus.$",
-//                                     "relationsFromThisTaxon.toTaxon.$",
-////                                   "relationsFromThisTaxon.toTaxon.name.extensions.type.$",
-//                                     "relationsFromThisTaxon.toTaxon.name.status.$",
-//                                     "relationsFromThisTaxon.toTaxon.name.status.type.$",
-//                                     "relationsFromThisTaxon.toTaxon.name.descriptions.elements.$",
-//                                     "relationsFromThisTaxon.toTaxon.name.typeDesignations.typeStatus.$",
-
-//                                     "relationsToThisTaxon.fromTaxon.$",
-//                                     "relationsToThisTaxon.fromTaxon.name.extensions.type.$",
-//                                     "relationsToThisTaxon.fromTaxon.name.status.type.$",
-//                                     "relationsToThisTaxon.fromTaxon.name.descriptions.elements.$",
-//                                     "relationsToThisTaxon.fromTaxon.name.typeDesignations.typeStatus.$",
-//                                     "relationsToThisTaxon.toTaxon.$",
-//                                     "relationsToThisTaxon.toTaxon.name.status.type.$",
-//                                     "relationsToThisTaxon.toTaxon.name.descriptions.elements.$",
-//                                     "relationsToThisTaxon.toTaxon.name.typeDesignations.typeStatus.$",
-
-                                       // TaxonNameEditor.createOrUpdateNameComposites()
-                                       // ContainerFactory.createOrUpdateAcceptedTaxonsHomotypicGroup()
-                                       "name.homotypicalGroup.typifiedNames.$",
-                                       "name.homotypicalGroup.synonymsInGroup",
-                                       "name.synonymRelations",
-                                       "name.descriptions.elements.$",
-                                       
-//                                     "name.descriptions.scopes.$",
-//                                     "name.descriptions.scopes.terms.$",
-                                       "name.descriptions.geoscopes.$",
-                                       "name.descriptions.geoscopes.vocabulary.$",
-                                       "name.descriptions.geoscopes.vocabulary.terms.$",
-                                       
-                                       // ContainerFactory.createOrUpdateAcceptedTaxonsHomotypicGroup()
-                                       "name.homotypicalGroup.$",
-                                       "name.homotypicalGroup.typifiedNames:$",                                        
-
-                                       "synonymRelations.synonym.name.$",
-                                       "synonymRelations.synonym.name.descriptions.elements.$",
-                                       "synonymRelations.synonym.name.homotypicalGroup.$",
-                                       "synonymRelations.synonym.name.homotypicalGroup.typifiedNames.$",
-                                       "synonymRelations.synonym.name.status.$",
-
-                                       "synonymRelations.synonym.name.typeDesignations.$",
-                                       "synonymRelations.synonym.name.typeDesignations.typifiedNames.$",
-                                       "synonymRelations.synonym.name.typeDesignations.typeStatus.$",
-                                       "synonymRelations.synonym.name.typeDesignations.typeName.$",
-                                       "synonymRelations.synonym.name.typeDesignations.typeSpecimen.$",
-
-                                       
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // VersionableEntity            : toOne-> "updated, updatedBy"
-                                       // AnnotatableEntity            : toMany-> "annotations, markers"
-                                       // DescriptionElementBase       : toMany->"" (available: "media, modifiers, modifyingText, sources" )
-                                       //                                                      : toOne-> "feature, inDescription"
-                                       // CategoricalData                      : toMany->"" (available: "states" )
-                                       // CommonTaxaName                       : toOne->"area, language"
-                                       // Distribution                         : toOne->"area, status"
-                                       // IndividualsAssociation       : toMany->"" (available: "description" )
-                                       //                                                      : toOne-> "associatedSpecimenOrObserviation"
-                                       // QuantitativeData                     : toMany->"" (available: "statisticalValues" )
-                                       //                                                      : toOne-> "unit"
-                                       // TaxonInteraction                     : toMany->"" (available: "descriptions" )
-                                       //                                                      : toOne-> "taxon2"
-                                       // TextData                                     : toMany->"" (available: "multilanguageText" )
-                                       //                                                      : toOne-> "format, languageText, preferredLanguageString"
-                                       "descriptions.elements.$",
-
-                                       "descriptions.elements.annotations.$",
-                                       "descriptions.elements.markers.markerType.$",
-
-                                       "descriptions.elements.modifiers.$",
-                                       "descriptions.elements.modifyingText.$",
-                                       
-                                       "descriptions.elements.description.$",
-
-                                       "descriptions.elements.associatedSpecimenOrObservation.$",
-                                       "descriptions.elements.associatedSpecimenOrObservation.annotations.$",
-                                       "descriptions.elements.associatedSpecimenOrObservation.annotations.annotationType.$",
-                                       "descriptions.elements.associatedSpecimenOrObservation.markers.markerType.$",
-                                       "descriptions.elements.associatedSpecimenOrObservation.credits.$",
-                                       "descriptions.elements.associatedSpecimenOrObservation.extensions.type.$",
-                                       "descriptions.elements.associatedSpecimenOrObservation.rights.$",
-                                       "descriptions.elements.associatedSpecimenOrObservation.sources.$",
-                                       "descriptions.elements.associatedSpecimenOrObservation.media.$",
-                                       "descriptions.elements.associatedSpecimenOrObservation.media.representations.parts.$",
-                                       
-                                       "descriptions.elements.descriptions.$",
-
-                                       "descriptions.elements.multilanguageText.$",
-                                       
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // VersionableEntity            : toOne-> "updated, updatedBy"
-                                       // AnnotatableEntity            : toMany-> "annotations, markers"
-                                       // IdentifiableEntity           : toMany-> "credits, extensions, rights, sources" 
-                                       //                                                      : toOne-> "lsid"
-                                       // Media                                        : toMany->"allDescriptions, allTitles, representations"
-                                       //                                                      : toOne-> "artist, description, mediaCreated, title"
-                           "descriptions.elements.media.$",
-//                         "descriptions.elements.media.allDescriptions.$",
-                                       // CdmBase                                      : toOne-> "created, createdBy, uuid"
-                                       // VersionableEntity            : toOne-> "updated, updatedBy"
-                           // MediaRepresentation              : toMany-> "parts"
-                                       //                                                      : toOne-> "media"
-                           // MediaRepresentationPart  : toOne-> "mediaRepresentation, size, uri"
-                           "descriptions.elements.media.representations.parts.$",
-
-                           "descriptions.elements.media.annotations.$",
-                           "descriptions.elements.media.annotations.annotationType.$",
-                           "descriptions.elements.media.credits.$",
-                           "descriptions.elements.media.extensions.$",
-                           "descriptions.elements.media.extensions.type.$",
-                           "descriptions.elements.media.markers.$",
-                           "descriptions.elements.media.markers.marker.Type.$",
-                           "descriptions.elements.media.rights.$",
-                           "descriptions.elements.media.sources.$",
-
-                                       "descriptions.elements.states.$",
-                                       "descriptions.elements.statisticalValues.$",
-                           
-                           
-                           // DescriptiveContentProvider.getContainerTreeForDesription()
-                           // FeatureNodeContainerTree.getDescriptionsElementsForFeature()                         
-                           // DescriptionHelper.getElementText()
-
-                           // CdmBase                                  : toOne-> "created, createdBy, uuid"
-                                       // VersionableEntity            : toOne-> "updated, updatedBy"
-                                       // AnnotatableEntity            : toMany-> "annotations, markers"
-                                       // ReferencedEntityBase         : toOne-> "citation"    
-                                       // DescriptionElementSource     : toOne-> "nameUsedInSource, sourcedObj"
-                                       "descriptions.elements.sources.$",
-
-                                       // NamedArea.labelWithLevel()
-
-                           // CdmBase                                  : toOne-> "created, createdBy, uuid"
-                                       // VersionableEntity            : toOne-> "updated, updatedBy"
-                                       // AnnotatableEntity            : toMany-> "annotations, markers"
-                                       // ReferencedEntityBase         : toOne-> "citation"    
-                                       // NamedArea                            : toMany->"" (available: "allLevelList, generalizationOf, includes, waterbodiesOrCountries" )
-                                       //                                                      : toOne-> "hierarchieList, kindOf, level, partOf, pointApproximation, shape, type, validPeriod"
-                                       "descriptions.elements.area.$",
-                                       "descriptions.elements.area.allLevelList.$",
-                                       "descriptions.elements.area.allLevelList.vocabulary.$",
-                                       "descriptions.elements.area.allLevelList.vocabulary.terms.$",
-                                       "descriptions.elements.area.vocabulary.$",
-                                       "descriptions.elements.area.vocabulary.terms.$",
-                                       "descriptions.elements.vocabulary.$",
-                                       "descriptions.elements.vocabulary.terms.$",
-                                       
-                                       
-//                                     "descriptions.scopes.$",
-//                                     "descriptions.scopes.terms.$",
-//                                     "descriptions.geoscopes.$",
-//                                     "descriptions.geoscopes.vocabulary.$",
-//                                     "descriptions.geoscopes.vocabulary.terms.$",
-                                       
-                                       // NameRelationshipDetailSection.createElementComposite()
-                                       // NameRelationshipDetailElement.setEntity()
-                                       "name.nameRelations.$",
-
-                                       
-                                       "name.extensions.$",
-                                       "name.extensions.type.$",
-                                       
-                                       "name.basionymAuthorTeam.$",                                    
-                                       "name.basionymAuthorTeam.annotations.$",
-                                       "name.basionymAuthorTeam.annotations.annotationType.$",
-                                       "name.basionymAuthorTeam.markers.markerType.$",
-                                       "name.basionymAuthorTeam.credits.$",
-                                       "name.basionymAuthorTeam.extensions.type.$",
-                                       "name.basionymAuthorTeam.rights.$",
-                                       "name.basionymAuthorTeam.sources.$",
-                                       "name.basionymAuthorTeam.media.$",
-                                       "name.basionymAuthorTeam.media.representations.parts.$",
-                                       "name.basionymAuthorTeam.teamMembers.$",
-                                       "name.basionymAuthorTeam.teamMembers.annotations.$",
-                                       "name.basionymAuthorTeam.teamMembers.annotations.annotationType.$",
-                                       "name.basionymAuthorTeam.teamMembers.markers.markerType.$",
-                                       "name.basionymAuthorTeam.teamMembers.credits.$",
-                                       "name.basionymAuthorTeam.teamMembers.extensions.type.$",
-                                       "name.basionymAuthorTeam.teamMembers.rights.$",
-                                       "name.basionymAuthorTeam.teamMembers.sources.$",
-                                       "name.basionymAuthorTeam.teamMembers.media.$",
-                                       "name.basionymAuthorTeam.teamMembers.media.representations.parts.$",
-
-                                       "name.combinationAuthorTeam.$",                                 
-                                       "name.combinationAuthorTeam.annotations.$",
-                                       "name.combinationAuthorTeam.annotations.annotationType.$",
-                                       "name.combinationAuthorTeam.markers.markerType.$",
-                                       "name.combinationAuthorTeam.credits.$",
-                                       "name.combinationAuthorTeam.extensions.type.$",
-                                       "name.combinationAuthorTeam.rights.$",
-                                       "name.combinationAuthorTeam.sources.$",
-                                       "name.combinationAuthorTeam.media.$",
-                                       "name.combinationAuthorTeam.media.representations.parts.$",
-                                       "name.combinationAuthorTeam.teamMembers.$",
-                                       "name.combinationAuthorTeam.teamMembers.annotations.$",
-                                       "name.combinationAuthorTeam.teamMembers.annotations.annotationType.$",
-                                       "name.combinationAuthorTeam.teamMembers.markers.markerType.$",
-                                       "name.combinationAuthorTeam.teamMembers.credits.$",
-                                       "name.combinationAuthorTeam.teamMembers.extensions.type.$",
-                                       "name.combinationAuthorTeam.teamMembers.rights.$",
-                                       "name.combinationAuthorTeam.teamMembers.sources.$",
-                                       "name.combinationAuthorTeam.teamMembers.media.$",
-                                       "name.combinationAuthorTeam.teamMembers.media.representations.parts.$",
-
-                                       "name.exBasionymAuthorTeam.$",                                  
-                                       "name.exBasionymAuthorTeam.annotations.$",
-                                       "name.exBasionymAuthorTeam.annotations.annotationType.$",
-                                       "name.exBasionymAuthorTeam.markers.markerType.$",
-                                       "name.exBasionymAuthorTeam.credits.$",
-                                       "name.exBasionymAuthorTeam.extensions.type.$",
-                                       "name.exBasionymAuthorTeam.rights.$",
-                                       "name.exBasionymAuthorTeam.sources.$",
-                                       "name.exBasionymAuthorTeam.media.$",
-                                       "name.exBasionymAuthorTeam.media.representations.parts.$",
-                                       "name.exBasionymAuthorTeam.teamMembers.$",
-                                       "name.exBasionymAuthorTeam.teamMembers.annotations.$",
-                                       "name.exBasionymAuthorTeam.teamMembers.annotations.annotationType.$",
-                                       "name.exBasionymAuthorTeam.teamMembers.markers.markerType.$",
-                                       "name.exBasionymAuthorTeam.teamMembers.credits.$",
-                                       "name.exBasionymAuthorTeam.teamMembers.extensions.type.$",
-                                       "name.exBasionymAuthorTeam.teamMembers.rights.$",
-                                       "name.exBasionymAuthorTeam.teamMembers.sources.$",
-                                       "name.exBasionymAuthorTeam.teamMembers.media.$",
-                                       "name.exBasionymAuthorTeam.teamMembers.media.representations.parts.$",
-
-                                       "name.exCombinationAuthorTeam.$",                                       
-                                       "name.exCombinationAuthorTeam.annotations.$",
-                                       "name.exCombinationAuthorTeam.annotations.annotationType.$",
-                                       "name.exCombinationAuthorTeam.markers.markerType.$",
-                                       "name.exCombinationAuthorTeam.credits.$",
-                                       "name.exCombinationAuthorTeam.extensions.type.$",
-                                       "name.exCombinationAuthorTeam.rights.$",
-                                       "name.exCombinationAuthorTeam.sources.$",
-                                       "name.exCombinationAuthorTeam.media.$",
-                                       "name.exCombinationAuthorTeam.media.representations.parts.$",
-                                       "name.exCombinationAuthorTeam.teamMembers.$",
-                                       "name.exCombinationAuthorTeam.teamMembers.annotations.$",
-                                       "name.exCombinationAuthorTeam.teamMembers.annotations.annotationType.$",
-                                       "name.exCombinationAuthorTeam.teamMembers.markers.markerType.$",
-                                       "name.exCombinationAuthorTeam.teamMembers.credits.$",
-                                       "name.exCombinationAuthorTeam.teamMembers.extensions.type.$",
-                                       "name.exCombinationAuthorTeam.teamMembers.rights.$",
-                                       "name.exCombinationAuthorTeam.teamMembers.sources.$",
-                                       "name.exCombinationAuthorTeam.teamMembers.media.$",
-                                       "name.exCombinationAuthorTeam.teamMembers.media.representations.parts.$",
-                                       
-                                       "name.nomenclaturalReference.annotations.$",
-                                       "name.nomenclaturalReference.annotations.annotationType.$",
-                                       "name.nomenclaturalReference.authorTeam.$",
-                                       "name.nomenclaturalReference.authorTeam.media.$",
-                                       "name.nomenclaturalReference.authorTeam.media.representations.parts.$",
-                                       "name.nomenclaturalReference.markers.markerType.$",
-                                       "name.nomenclaturalReference.credits.$",
-                                       "name.nomenclaturalReference.extensions.type.$",
-                                       "name.nomenclaturalReference.rights.$",
-                                       "name.nomenclaturalReference.rights.type.$",
-                                       "name.nomenclaturalReference.sources.$",
-                                       "name.nomenclaturalReference.media.$",
-                                       "name.nomenclaturalReference.media.representations.parts.$",
-                                       "name.nomenclaturalReference.inReference.$",
-                                       "name.nomenclaturalReference.inReference.annotations.$",
-                                       "name.nomenclaturalReference.inReference.annotations.annotationType.$",
-                                       "name.nomenclaturalReference.inReference.markers.markerType.$",                                 
-
-                                       "name.nomenclaturalReference.inReference.credits.$",
-                                       "name.nomenclaturalReference.inReference.extensions.type.$",
-                                       "name.nomenclaturalReference.inReference.rights.$",
-                                       "name.nomenclaturalReference.inReference.rights.type.$",
-                                       "name.nomenclaturalReference.inReference.sources.$",
-                                       "name.nomenclaturalReference.inReference.media.$",
-                                       "name.nomenclaturalReference.inReference.media.representations.parts.$",
-
-                                       "name.status.$",
-                                       "name.status.annotations.$",
-                                       "name.status.annotations.annotationType.$",
-                                       "name.status.markers.markerType.$",
-                                       "name.status.type.$",
-
-                                       "name.typeDesignations.$",
-                                       "name.typeDesignations.typifiedNames.$",
-                                       "name.typeDesignations.typeStatus.$",
-                                       "name.typeDesignations.typeName.$",
-                                       "name.typeDesignations.typeSpecimen.$",
-
-                       });
-                       
-                       return (Taxon) CdmStore.getService(ITaxonService.class).load(taxonNode.getTaxon().getUuid(), TAXON_INIT_STRATEGY);
-
+               return taxonNode.getTaxon();
        }
 
        /**

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java
index 62e56bcd4bf62e262f88642a72080bef78febb07..3219c650c5b21b56653f5b8f632f0ce1930bd7e3 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java
@@ -17,14 +17,18 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 
+import eu.etaxonomy.cdm.api.service.ITaxonService;
+import eu.etaxonomy.cdm.api.service.exception.DataChangeNoRollbackException;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
+import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
@@ -87,19 +91,16 @@ public class ChangeConceptToSynonymOperation extends
 
                // Create new synonym using concept name
                TaxonNameBase<?, ?> synonymName = concept.getName();
-
-               // Remove concept relation from taxon
-               element.removeTaxon(concept, oldRelationshipType);
-               monitor.worked(20);
-
-               // Add name to new homotypic group
-               homotypicalGroup.addTypifiedName(synonymName);
-               monitor.worked(40);
-
-        // Create a new synonym for the taxon
-               newSynonymRelationship = element.addHeterotypicSynonymName(synonymName);
-
-               return postExecute(newSynonymRelationship.getSynonym());
+               Synonym synonym = null;
+               try {
+                       synonym = CdmStore.getService(ITaxonService.class).changeRelatedTaxonToSynonym(concept, element, taxonRelationship.getType(), null);
+               } catch (DataChangeNoRollbackException e) {
+                       // TODO Auto-generated catch block
+                       e.printStackTrace();
+               }
+               
+       
+               return postExecute(synonym);
        }
 
        /* (non-Javadoc)

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
index db12603068cb6d992b1ee67e4379c0d78066cd96..9fdb66b7acb266a0dcae034a2c7766d74e3b7150 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
@@ -98,7 +98,6 @@ public class NavigationUtil extends AbstractUtility{
                        AbstractUtility.error(NavigationUtil.class, "Error opening the editor", e);
                } catch (Exception e) {
                        AbstractUtility.warningDialog("Could not create Taxon", NavigationUtil.class, e.getMessage());
-                       e.printStackTrace();
                }
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index 26bd4ff9581a6585d8d2ab3f14ddb177b5165d06..c3b5a4e33d389a3f1c9269e4f71599e9f582b4a0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@ -80,137 +80,159 @@ Import-Package: org.eclipse.core.commands,
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .,
- activation-1.1.jar,
- antlr-2.7.6.jar,
+ activation-1.1.1.jar,
+ antlr-2.7.7.jar,
  aopalliance-1.0.jar,
- asm-attrs.jar,
- asm.jar,
- aspectjrt-1.6.3.jar,
- aspectjweaver-1.6.3.jar,
- avalon-framework-4.2.0.jar,
- batik-all-1.7.jar,
- c3p0-0.9.1.jar,
- cdmlib-commons-3.0.7-SNAPSHOT.jar,
- cdmlib-ext-3.0.7-SNAPSHOT.jar,
- cdmlib-io-3.0.7-SNAPSHOT.jar,
- cdmlib-model-3.0.7-SNAPSHOT.jar,
- cdmlib-persistence-3.0.7-SNAPSHOT.jar,
- cdmlib-print-3.0.7-SNAPSHOT.jar,
- cdmlib-remote-3.0.7-SNAPSHOT.jar,
- cglib-2.1.3.jar,
- commons-beanutils-1.7.0.jar,
- commons-collections-3.2.jar,
- commons-dbcp-1.2.2.jar,
- commons-io-1.3.1.jar,
- commons-logging-1.0.4.jar,
- commons-pool-1.3.jar,
+ aspectjrt-1.7.1.jar,
+ aspectjweaver-1.7.1.jar,
+ avro-1.6.3.jar,
+ batik-anim-1.7.jar,
+ batik-awt-util-1.7.jar,
+ batik-bridge-1.7.jar,
+ batik-css-1.7.jar,
+ batik-dom-1.7.jar,
+ batik-ext-1.7.jar,
+ batik-extension-1.7.jar,
+ batik-gvt-1.7.jar,
+ batik-js-1.7.jar,
+ batik-parser-1.7.jar,
+ batik-script-1.7.jar,
+ batik-svg-dom-1.7.jar,
+ batik-svggen-1.7.jar,
+ batik-transcoder-1.7.jar,
+ batik-util-1.7.jar,
+ batik-xml-1.7.jar,
+ c3p0-0.9.2.jar,
+ cdmlib-commons-3.3.1-SNAPSHOT-sources.jar,
+ cdmlib-commons-3.3.1-SNAPSHOT.jar,
+ cdmlib-ext-3.3.1-SNAPSHOT-sources.jar,
+ cdmlib-ext-3.3.1-SNAPSHOT.jar,
+ cdmlib-io-3.3.1-SNAPSHOT-sources.jar,
+ cdmlib-io-3.3.1-SNAPSHOT.jar,
+ cdmlib-model-3.3.1-SNAPSHOT-sources.jar,
+ cdmlib-model-3.3.1-SNAPSHOT.jar,
+ cdmlib-persistence-3.3.1-SNAPSHOT-sources.jar,
+ cdmlib-persistence-3.3.1-SNAPSHOT.jar,
+ cdmlib-print-3.3.1-SNAPSHOT-sources.jar,
+ cdmlib-print-3.3.1-SNAPSHOT.jar,
+ cdmlib-remote-3.3.1-SNAPSHOT-sources.jar,
+ cdmlib-remote-3.3.1-SNAPSHOT.jar,
+ cdmlib-services-3.3.1-SNAPSHOT-sources.jar,
+ cglib-nodep-2.2.2.jar,
+ commons-codec-20041127.091804.jar,
+ concurrent-1.3.4.jar,
+ dbunit-2.4.9.jar,
  dom4j-1.6.1.jar,
- dozer-5.3.0-sources.jar,
+ doxia-core-1.3.jar,
+ doxia-logging-api-1.3.jar,
+ doxia-module-apt-1.3.jar,
+ doxia-module-xhtml-1.3.jar,
+ doxia-sink-api-1.3.jar,
  dozer-5.3.0.jar,
- ehcache-1.2.3.jar,
- ejb3-persistence.jar,
- ezmorph-1.0.4.jar,
- fop.jar,
+ easymockclassextension-2.3.jar,
+ ehcache-core-2.4.3.jar,
+ ezmorph-1.0.6.jar,
+ fop-1.1.jar,
  google-api-translate-java-0.92.jar,
- hibernate-annotations-3.4.0-SNAPSHOT.jar,
- hibernate-commons-annotations-3.4.0-SNAPSHOT.jar,
- hibernate-core-3.4.0-SNAPSHOT.jar,
- hibernate-envers-3.4.0-SNAPSHOT.jar,
- hibernate-search-3.1.0.GA.jar,
- hibernate-tools-3.2.0.ga.jar,
- hibernate-validator-4.0.0.CR1.jar,
- hsqldb.jar,
- httpclient-4.0.1.jar,
- httpcore-4.0.1.jar,
- javassist.jar,
- jaxb-api-2.1.6.jar,
- jaxb-impl-2.1.6.jar,
- jaxen-1.1.2.jar,
- jdbc-1.2.jar,
- jdbc2_0-stdext.jar,
- jdom.jar,
- joda-time-1.5.jar,
- joda-time-hibernate-1.0.jar,
- json-lib-2.2.3-jdk15.jar,
+ guava-r05.jar,
+ hamcrest-core-1.3.jar,
+ hibernate-c3p0-4.1.10.Final.jar,
+ hibernate-cglib-repack-2.1_3.jar,
+ hibernate-commons-annotations-4.0.1.Final.jar,
+ hibernate-core-4.1.10.Final.jar,
+ hibernate-ehcache-4.1.10.Final.jar,
+ hibernate-entitymanager-4.1.10.Final.jar,
+ hibernate-envers-4.1.10.Final.jar,
+ hibernate-jpa-2.0-api-1.0.1.Final.jar,
+ hibernate-search-4.2.0.Final.jar,
+ hibernate-search-analyzers-4.2.0.Final.jar,
+ hibernate-search-engine-4.2.0.Final.jar,
+ hibernate-search-orm-4.2.0.Final.jar,
+ hsqldb-1.8.0.10.jar,
+ httpclient-4.2.3.jar,
+ httpcore-4.2.4.jar,
+ icu4j-2.6.1.jar,
+ identificationKeyAPI-1.0-SNAPSHOT-sources.jar,
+ identificationKeyAPI-1.0-SNAPSHOT.jar,
+ jakarta-regexp-1.4.jar,
+ jaxb-api-2.2.7.jar,
+ jaxb-impl-2.2-EA.jar,
+ jaxb-xjc-2.2-EA.jar,
+ jaxb1-impl-2.2-EA.jar,
+ jaxen-1.1.4.jar,
+ jboss-transaction-api_1.1_spec-1.0.0.Final.jar,
+ jdbc4-2.0.jar,
+ jdom-1.1.3.jar,
+ json-lib-2.4-jdk15.jar,
  jsr250-api-1.0.jar,
- jta.jar,
- jtds-1.2.2.jar,
- junit-4.4.jar,
- junit-4.8.1-sources.jar,
- junit-4.8.1.jar,
- log4j-1.2.14.jar,
+ jtds-1.3.0.jar,
+ junit-4.11.jar,
+ junit-benchmarks-0.5.0.jar,
  lsid-client-1.1.2.jar,
  lsid-server-1.1.2.jar,
- lucene-core-2.4.0.jar,
- lucene-spellchecker-2.4.0.jar,
- mail-1.4.jar,
- msbase-2000.3.jar,
- mssqlserver-2000.3.jar,
- msutil-2000.3.jar,
- mysql-connector-java-5.0.5.jar,
+ lucene-analyzers-3.6.2.jar,
+ lucene-core-3.6.2.jar,
+ lucene-facet-3.6.2.jar,
+ lucene-grouping-3.6.2.jar,
+ lucene-highlighter-3.6.2.jar,
+ lucene-kuromoji-3.6.2.jar,
+ lucene-memory-3.6.2.jar,
+ lucene-misc-3.6.2.jar,
+ lucene-phonetic-3.6.2.jar,
+ lucene-queries-3.6.2.jar,
+ lucene-smartcn-3.6.2.jar,
+ lucene-spatial-3.6.2.jar,
+ lucene-spellchecker-3.6.2.jar,
+ lucene-stempel-3.6.2.jar,
+ mchange-commons-java-0.2.3.3.jar,
  odfdom-0.8.jar,
- opencsv-1.8.jar,
- org.springframework.aop-3.0.4.RELEASE-sources.jar,
- org.springframework.asm-3.0.4.RELEASE-sources.jar,
- org.springframework.aspects-3.0.4.RELEASE-sources.jar,
- org.springframework.beans-3.0.4.RELEASE-sources.jar,
- org.springframework.context-3.0.4.RELEASE-sources.jar,
- org.springframework.context.support-3.0.4.RELEASE-sources.jar,
- org.springframework.core-3.0.4.RELEASE-sources.jar,
- org.springframework.expression-3.0.4.RELEASE-sources.jar,
- org.springframework.jdbc-3.0.4.RELEASE-sources.jar,
- org.springframework.orm-3.0.4.RELEASE-sources.jar,
- org.springframework.oxm-3.0.4.RELEASE-sources.jar,
- org.springframework.transaction-3.0.4.RELEASE-sources.jar,
- org.springframework.web-3.0.4.RELEASE-sources.jar,
- org.springframework.web.servlet-3.0.4.RELEASE-sources.jar,
- poi-3.1-FINAL.jar,
- postgresql-8.2-504.jdbc4.jar,
- saxon9he.jar,
- serializer-2.7.0.jar,
+ odfdom-java-0.8.7.jar,
+ ognl-2.6.9.jar,
+ opencsv-2.3.jar,
+ p6spy-1.3.jar,
+ paranamer-2.3.jar,
+ plexus-classworlds-1.2-alpha-9.jar,
+ plexus-container-default-1.0-alpha-30.jar,
+ plexus-utils-2.0.5.jar,
+ poi-3.9.jar,
+ postgresql-9.1-901.jdbc4.jar,
  servlet-api-2.5.jar,
+ solr-analysis-extras-3.6.2.jar,
+ solr-core-3.6.2.jar,
+ solr-solrj-3.6.2.jar,
+ spring-aop-3.2.2.RELEASE.jar,
+ spring-beans-3.2.2.RELEASE.jar,
+ spring-context-3.2.2.RELEASE.jar,
+ spring-context-support-3.2.2.RELEASE.jar,
+ spring-core-3.2.2.RELEASE.jar,
+ spring-expression-3.2.2.RELEASE.jar,
  spring-modules-cache-0.7.jar,
- spring-modules-lucene-0.8a.jar,
- wsdl4j-1.6.1.jar,
- xalan-2.7.0.jar,
- xercesImpl-2.7.1.jar,
- xercesImpl.jar,
- xml-apis-1.3.04.jar,
+ stax-1.2.0.jar,
+ stax-api-1.0.1.jar,
+ unitils-core-3.3.jar,
+ unitils-database-3.3.jar,
+ unitils-dbmaintainer-3.3.jar,
+ unitils-dbunit-3.3.jar,
+ unitils-easymock-3.3.jar,
+ unitils-inject-3.3.jar,
+ unitils-mock-3.3.jar,
+ unitils-orm-3.3.jar,
+ unitils-spring-3.3.jar,
+ usertype.jodatime-2.0.1.jar,
+ usertype.spi-2.0.1.jar,
+ validation-api-1.0.0.GA.jar,
+ wsdl4j-1.6.2.jar,
+ xalan-2.6.0.jar,
+ xercesImpl-2.11.0.jar,
+ xml-apis-1.0.b2.jar,
  xml-apis-ext-1.3.04.jar,
- xml-apis.jar,
  xml-resolver-1.2.jar,
- xmlgraphics-commons-1.3.1.jar,
+ xmlParserAPIs-2.6.2.jar,
+ xmlgraphics-commons-1.5.jar,
+ xmlpull-1.1.3.1.jar,
+ xmlunit-1.4.jar,
  xom-1.0.jar,
- xsltc.jar,
- xstream-1.3.1.jar,
- yjp-controller-api-redist-8.0.1.jar,
- ant-antlr.jar,
- ant-apache-bcel.jar,
- ant-apache-bsf.jar,
- ant-apache-log4j.jar,
- ant-apache-oro.jar,
- ant-apache-regexp.jar,
- ant-apache-resolver.jar,
- ant-commons-logging.jar,
- ant-commons-net.jar,
- ant-jai.jar,
- ant-javamail.jar,
- ant-jdepend.jar,
- ant-jmf.jar,
- ant-jsch.jar,
- ant-junit.jar,
- ant-launcher.jar,
- ant-netrexx.jar,
- ant-nodeps.jar,
- ant-starteam.jar,
- ant-stylebook.jar,
- ant-swing.jar,
- ant-trax.jar,
- ant-weblogic.jar,
- ant.jar,
- runtime_registry_compatibility.jar,
- jdi.jar,
- jdimodel.jar,
- pdebuild.jar,
- compatibility.jar,
- junit.jar
+ xpp3-1.1.4c.jar,
+ xpp3_min-1.1.4c.jar,
+ xstream-1.4.4.jar,
+ yjp-controller-api-redist-9.0.8.jar

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOManager.java
index 6bc1250bcbcac995634141f1b4c863127ec64c9f..5b0d4fc6f1e2a33805ca03c3c93bab1f6fc58fb7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOManager.java
@@ -13,8 +13,8 @@ package eu.etaxonomy.taxeditor.io;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.ui.progress.IProgressConstants;
 
-import eu.etaxonomy.cdm.io.common.IIoConfigurator;
 import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
+import eu.etaxonomy.cdm.io.common.IIoConfigurator;
 
 /**
  * <p>
@@ -40,7 +40,7 @@ public abstract class AbstractIOManager<CONFIGURATOR extends IIoConfigurator> {
         * 
         * @param applicationController
         *            a
-        *            {@link eu.etaxonomy.cdm.remote.api.application.CdmApplicationController}
+        *            {@link eu.etaxonomy.cdm.api.application.CdmApplicationController}
         *            object.
         * @param <CONFIGURATOR>
         *            a CONFIGURATOR object.

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java
index b19810b89d7ee4b1237978fe636194ea7833569e..984b7697b94aec721f63f5b821d4be9a1e55dbf8 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java
@@ -18,13 +18,13 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbenchPart;
 
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.io.common.CdmDefaultExport;
 import eu.etaxonomy.cdm.io.common.IExportConfigurator;
 import eu.etaxonomy.cdm.io.common.IIoConfigurator;
 import eu.etaxonomy.cdm.io.jaxb.JaxbExportConfigurator;
 import eu.etaxonomy.cdm.io.sdd.out.SDDExportConfigurator;
-import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
@@ -54,7 +54,7 @@ public class ExportManager extends AbstractIOManager<IExportConfigurator> {
         * 
         * @param applicationConfiguration
         *            a
-        *            {@link eu.etaxonomy.cdm.remote.api.application.CdmApplicationController}
+        *            {@link eu.etaxonomy.cdm.api.application.CdmApplicationController}
         *            object.
         * @return a {@link eu.etaxonomy.taxeditor.io.ExportManager} object.
         */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
index 48246bfcf43c08f3ad271654c2002d6a14c72868..64e097cb349bda65d44fca07e5c0f1d378f50cf0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
@@ -17,6 +17,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
 
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;
 import eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitImportConfigurator;
@@ -26,7 +27,6 @@ import eu.etaxonomy.cdm.io.sdd.in.SDDImportConfigurator;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
 import eu.etaxonomy.cdm.io.specimen.excel.in.SpecimenCdmExcelImportConfigurator;
 import eu.etaxonomy.cdm.io.tcsxml.in.TcsXmlImportConfigurator;
-import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
@@ -56,7 +56,7 @@ public class ImportManager extends AbstractIOManager<IImportConfigurator> {
         * 
         * @param applicationConfiguration
         *            a
-        *            {@link eu.etaxonomy.cdm.remote.api.application.CdmApplicationController}
+        *            {@link eu.etaxonomy.cdm.api.application.CdmApplicationController}
         *            object.
         * @return a {@link eu.etaxonomy.taxeditor.io.ImportManager} object.
         */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
index 46768210331d339f4784d5cc00c041a7ad70eff8..70d4ba028f39302bf9ebe680fbfb156836087b90 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
@@ -61,7 +61,7 @@ import org.eclipse.ui.themes.IThemeManager;
 
 import eu.etaxonomy.cdm.database.PermissionDeniedException;
 import eu.etaxonomy.cdm.model.common.IEnumTerm;
-//import eu.etaxonomy.cdm.persistence.hibernate.permission.SecurityExceptionUtils;
+import eu.etaxonomy.cdm.persistence.hibernate.permission.SecurityExceptionUtils;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
@@ -491,7 +491,7 @@ public abstract class AbstractUtility {
                                        // String PID = TaxonomicEditorPlugin.PLUGIN_ID;
                                        String PID = "eu.etaxonomy.taxeditor.application";
                                        
-                                       RuntimeException securityRuntimeException = null;//SecurityExceptionUtils.findSecurityRuntimeException(e);
+                                       RuntimeException securityRuntimeException = SecurityExceptionUtils.findSecurityRuntimeException(e);
                                        
                                        if(securityRuntimeException != null){
                                                title = "Your changes could not be saved!";

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java
index 0ddc337cdc4414bdd2f04123c097dbf2cfc13547..1348b2a67726408c713dc58abe7c7268125a5392 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java
@@ -27,11 +27,11 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Text;
 
+import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.ext.ipni.IIpniService;
 import eu.etaxonomy.cdm.ext.ipni.IpniService;
 import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
index 9616b0ff6225a672da3fdf892527cc88b7e7e09b..0ca07983aaf269d2acd64d8edb7b03239c6943d6 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
@@ -162,7 +162,7 @@ public class ParseHandler{
                
                MatchMatrix matchMatrix = findMatches(parsedName);
                
-//             resolveDuplicates(parsedName, matchMatrix);
+               resolveDuplicates(parsedName, matchMatrix);
                
                return parsedName;
        }
@@ -329,13 +329,13 @@ public class ParseHandler{
         * @return      A <code>List</code> of possibly matching TaxonNameBase's.
         */
        private List<TaxonNameBase> findMatchingLatinNames(TaxonNameBase taxonNameBase) {
-//
-//             try {
-//                     return CdmStore.getService(ICommonService.class).findMatching(taxonNameBase, MatchStrategyConfigurator.NonViralNameMatchStrategy());
-//                     
-//             } catch (MatchException e) {
-//                     StoreUtil.error(this.getClass(), "Error finding matching names", e);
-//             }
+
+               try {
+                       return CdmStore.getService(ICommonService.class).findMatching(taxonNameBase, MatchStrategyConfigurator.NonViralNameMatchStrategy());
+                       
+               } catch (MatchException e) {
+                       StoreUtil.error(this.getClass(), "Error finding matching names", e);
+               }
                return null;
        }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
index d77912b8d2deaea5e8b5fef2c9eb78fdba545724..99eb03129d162278a8d820688d603b4f4840ea86 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java
@@ -186,13 +186,21 @@ public class SearchManager {
        @Deprecated
        //TODO: method needs to be optimized with a direct SQL query instead of iterating over all specimens
     public List<SpecimenOrObservationBase> findOccurrencesByType(IIdentifiableEntityServiceConfigurator configurator, SpecimenOrObservationType type){
-           List<SpecimenOrObservationBase> occurrences = new ArrayList<SpecimenOrObservationBase>();
-           for(SpecimenOrObservationBase occurrence:findOccurrences(configurator, true)){
-               if(occurrence.getRecordBasis()==type){
-                   occurrences.add(occurrence);
+           List<SpecimenOrObservationBase> filteredOccurrences = new ArrayList<SpecimenOrObservationBase>();
+           List<SpecimenOrObservationBase> occurrences = findOccurrences(configurator, true);
+           if(type!=null){
+               for(SpecimenOrObservationBase occurrence:occurrences){
+                   if(occurrence.getRecordBasis().equals(type)
+                           || occurrence.getRecordBasis().isKindOf(type)
+                           || type == SpecimenOrObservationType.Unknown){
+                       filteredOccurrences.add(occurrence);
+                   }
                }
            }
-           return occurrences;
+           else{
+               filteredOccurrences = occurrences;
+           }
+           return filteredOccurrences;
        }
 
        public List<User> findUsers(IIdentifiableEntityServiceConfigurator configurator){

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermComboController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermComboController.java
index 6ecef6ffa9c4c2edb80acce5a5f40f03372b730f..09c0e5307e1fc250cdaf88737e8e4f3c4219f225 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermComboController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermComboController.java
@@ -32,7 +32,6 @@ import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
 import eu.etaxonomy.taxeditor.ui.element.ISelectable;
@@ -275,7 +274,6 @@ IEnableableFormElement, ISelectable {
     @Override
     public void widgetSelected(SelectionEvent e) {
         selection = elementTypeList.get(combo.getSelectionIndex());
-        firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e));
     }
 
     /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java
index d13693b7809077aaf2de39979732751fc06b9af2..5c7479636ee89d66f152bf215f5fde92e427a287 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchComposite.java
@@ -13,6 +13,7 @@ import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
@@ -31,6 +32,7 @@ public class DerivateSearchComposite extends Composite {
     private final Table table;
     private final TableViewer resultViewer;
     private final Combo comboDerivateType;
+    private final Button buttonSearch;
 
     /**
      * Create the composite.
@@ -41,21 +43,22 @@ public class DerivateSearchComposite extends Composite {
         super(parent, style);
         setLayout(new GridLayout(2, false));
 
-        Label lblDerivateType = new Label(this, SWT.NULL);
-        lblDerivateType.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
-        lblDerivateType.setText("Derivate Filter");
+                comboDerivateType = new Combo(this, SWT.READ_ONLY);
+                comboDerivateType.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+                formToolkit.paintBordersFor(comboDerivateType);
 
-        comboDerivateType = new Combo(this, SWT.NONE);
-        comboDerivateType.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-        formToolkit.paintBordersFor(comboDerivateType);
+                        Label lblDerivateType = new Label(this, SWT.NULL);
+                        lblDerivateType.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
+                        lblDerivateType.setText("Derivate Filter");
 
-        Label lblNameFilter = new Label(this, SWT.NULL);
-        lblNameFilter.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
-        lblNameFilter.setText("Name Filter");
+                searchField = formToolkit.createText(this, "New Text", SWT.NONE);
+                searchField.setText("");
+                searchField.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
 
-        searchField = formToolkit.createText(this, "New Text", SWT.NONE);
-        searchField.setText("");
-        searchField.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
+        buttonSearch = new Button(this, SWT.NONE);
+        buttonSearch.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false, 1, 1));
+        formToolkit.adapt(buttonSearch, true, true);
+        buttonSearch.setText("Search");
 
         resultViewer = new TableViewer(this, SWT.BORDER | SWT.FULL_SELECTION);
         table = resultViewer.getTable();
@@ -76,4 +79,7 @@ public class DerivateSearchComposite extends Composite {
     public Combo getComboDerivateType() {
         return comboDerivateType;
     }
+    public Button getButtonSearch() {
+        return buttonSearch;
+    }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java
index 5ce36413776468b1e9e6d07a527a2804e9b7e8c0..ae71c75209e36265402d9234ac016b8022e6c752 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java
@@ -22,9 +22,10 @@ import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Widget;
 import org.eclipse.ui.handlers.IHandlerService;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeCacheStrategy;
@@ -42,7 +43,7 @@ import eu.etaxonomy.taxeditor.ui.mvc.combo.EnumTermComboController;
  * and handles GUI events.
  *
  */
-public class DerivateSearchCompositeController {
+public class DerivateSearchCompositeController implements Listener{
 
     private final DerivateSearchComposite derivateSearchComposite;
     private IIdentifiableEntityServiceConfigurator<SpecimenOrObservationBase<DerivedUnitFacadeCacheStrategy>> configurator;
@@ -65,22 +66,10 @@ public class DerivateSearchCompositeController {
             count++;
         }
 
-//        derivateSearchComposite.getComboDerivateType().setItems(comboItems);
         enumTermComboController = new EnumTermComboController<SpecimenOrObservationType>(derivateSearchComposite.getComboDerivateType(), null, null, SpecimenOrObservationType.class, 0);
 
-        derivateSearchComposite.getSearchField().addKeyListener(new KeyAdapter() {
-            /*
-             * (non-Javadoc)
-             * @see org.eclipse.swt.events.KeyAdapter#keyPressed(org.eclipse.swt.events.KeyEvent)
-             */
-            @Override
-            public void keyPressed(KeyEvent e) {
-                if (e.keyCode == SWT.CR) {
-                    String searchString = derivateSearchComposite.getSearchField().getText();
-                    searchDerivates(searchString);
-                }
-            }
-        });
+        derivateSearchComposite.getSearchField().addListener(SWT.KeyDown, this);
+        derivateSearchComposite.getButtonSearch().addListener(SWT.Selection, this);
 
         TableViewer resultViewer = derivateSearchComposite.getResultViewer();
         resultViewer.setContentProvider(new ArrayContentProvider());
@@ -109,9 +98,10 @@ public class DerivateSearchCompositeController {
 
     }
 
-    private void searchDerivates(String searchString){
-        configurator.setTitleSearchString(searchString);
-        List<SpecimenOrObservationBase> results = CdmStore.getSearchManager().findOccurrences(configurator, true);
+    private void searchDerivates(){
+        configurator.setTitleSearchString(derivateSearchComposite.getSearchField().getText());
+        SpecimenOrObservationType type = enumTermComboController.getSelection();
+        List<SpecimenOrObservationBase> results = CdmStore.getSearchManager().findOccurrencesByType(configurator, type);
         derivateSearchComposite.getResultViewer().setInput(results);
     }
 
@@ -129,4 +119,16 @@ public class DerivateSearchCompositeController {
         derivateSearchComposite.getSearchField().setEnabled(enabled);
     }
 
+    /* (non-Javadoc)
+     * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
+     */
+    @Override
+    public void handleEvent(Event event) {
+        Widget eventSource = event.widget;
+        if(eventSource == derivateSearchComposite.getButtonSearch()
+                || (eventSource == derivateSearchComposite.getSearchField() && event.keyCode == SWT.CR)){
+            searchDerivates();
+        }
+    }
+
 }