Project

General

Profile

« Previous | Next » 

Revision 7058de02

Added by Andreas Müller over 3 years ago

ref #6581 adapt vaadin to new nomenclatural source handling

View differences:

src/main/java/eu/etaxonomy/cdm/service/CdmFilterablePagingProviderFactory.java
101 101 
        CdmFilterablePagingProvider<TaxonName, TaxonName> pagingProvider = new CdmFilterablePagingProvider<TaxonName, TaxonName>(
102 102 
                repo.getNameService());
103 103 
        pagingProvider.setInitStrategy(
104 
                Arrays.asList("registrations", "nomenclaturalReference", "nomenclaturalReference.inReference"));
104 
                Arrays.asList("registrations", "nomenclaturalSource.citation", "nomenclaturalSource.citation.inReference"));
105 105 
        // pagingProvider.addRestriction(new
106 106 
        // Restriction<>("relationsFromThisName.type", Operator.AND_NOT, null,
107 107 
        // NameRelationshipType.ORTHOGRAPHIC_VARIANT()));
src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNameEditorPresenter.java
275 275 
                orthographicVariantNamePagingProvider.getRestrictions().remove(orthographicCorrectionRestriction);
276 276 
            } else {
277 277 
                if(orthographicCorrectionRestriction == null){
278 
                    orthographicCorrectionRestriction = new Restriction<>("nomenclaturalReference", Operator.AND, null, nomReference);
278 
                    orthographicCorrectionRestriction = new Restriction<>("nomenclaturalSource.citation", Operator.AND, null, nomReference);
279 279 
                    orthographicVariantNamePagingProvider.addRestriction(orthographicCorrectionRestriction);
280 280 
                } else{
281 281 
                    orthographicCorrectionRestriction.setValues(Arrays.asList(nomReference));
......
295 295 
                "annotations.*", // needed as log as we are using a table in FilterableAnnotationsField
296 296 
                "rank.vocabulary", // needed for comparing ranks
297 297 

  		




  298
  
  
    
                "nomenclaturalReference",


  		




  
  298
  
    
                "nomenclaturalSource.citation",


  		




  299
  299
  
    

  		




  300
  300
  
    
                "status.type",


  		




  301
  301
  
    
                "status.citation",


  		




  ......




  310
  310
  
    
                "relationsToThisName.fromName.rank",


  		




  311
  311
  
    
                "relationsToThisName.fromName.combinationAuthorship",


  		




  312
  312
  
    
                "relationsToThisName.fromName.exCombinationAuthorship",


  		




  313
  
  
    
                "relationsToThisName.fromName.nomenclaturalReference.authorship",


  		




  314
  
  
    
                "relationsToThisName.fromName.nomenclaturalReference.inReference.authorship",


  		




  315
  
  
    
                "relationsToThisName.fromName.nomenclaturalReference.inReference.inReference.inReference.authorship",


  		




  
  313
  
    
                "relationsToThisName.fromName.nomenclaturalSource.citation.authorship",


  		




  
  314
  
    
                "relationsToThisName.fromName.nomenclaturalSource.citation.inReference.authorship",


  		




  
  315
  
    
                "relationsToThisName.fromName.nomenclaturalSource.citation.inReference.inReference.inReference.authorship",


  		




  316
  316
  
    
                "relationsToThisName.fromName.relationsToThisName",


  		




  317
  317
  
    
                "relationsToThisName.fromName.relationsFromThisName",


  		




  318
  318
  
    
                "relationsToThisName.citation",


  		




  ......




  320
  320
  
    
                "homotypicalGroup.typifiedNames"


  		




  321
  321
  
    
                )


  		




  322
  322
  
    
              );


  		




  323
  
  
    
        initStrategy.extend("nomenclaturalReference", ReferenceEllypsisFormatter.INIT_STRATEGY, false);


  		




  
  323
  
    
        initStrategy.extend("nomenclaturalSource.citation", ReferenceEllypsisFormatter.INIT_STRATEGY, false);


  		




  324
  324
  
    
        initStrategy.extend("status.citation", ReferenceEllypsisFormatter.INIT_STRATEGY, false);


  		




  325
  325
  
    
        initStrategy.extend("relationsToThisName.citation", ReferenceEllypsisFormatter.INIT_STRATEGY, false);


  		




  326
  326
  
    

  		




  ......




  559
  559
  
    
                        }


  		




  560
  560
  
    
                    }


  		




  561
  561
  
    
                } else


  		




  562
  
  
    
                if(boundTargetField.matchesPropertyIdPath("nomenclaturalReference")){


  		




  
  562
  
    
                if(boundTargetField.matchesPropertyIdPath("nomenclaturalSource.citation")){


  		




  563
  563
  
    
                    if(event.isCreateOrModifiedType()){


  		




  564
  564
  
    
                        getCache().load(event.getEntity());


  		




  565
  565
  
    
                        if(event.isCreatedType()){


  		












  

    
      src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java
    
  





  223
  223
  
    
         - nameType: preset, needs to be set in the presenter for new names


  		




  224
  224
  
    
         - appendedPhrase: -> TODO field


  		




  225
  225
  
    
         - nomenclaturalMicroReference:  -> TODO field


  		




  226
  
  
    
         - nomenclaturalReference ->  field but disabled for REGISTRY


  		




  
  226
  
    
         - nomenclaturalSource.citation ->  field but disabled for REGISTRY


  		




  227
  227
  
    
         - rank -> SelectField which determines the visiblity of the other fields


  		




  228
  228
  
    

  		




  229
  229
  
    
         - fullTitleCache + protectedFullTitleCache -> SwitchableTextField : ADVANCED_MODE


  		












Also available in:  Unified diff