Project

General

Profile

« Previous | Next » 

Revision 8f1f6888

Added by Katja Luther almost 3 years ago

ref #7309: add collectorTitle/titleCache to editor

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AgentSelectionDialog.java
17 17 
import eu.etaxonomy.cdm.api.service.IAgentService;
18 18 
import eu.etaxonomy.cdm.model.agent.AgentBase;
19 19 
import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;
20 
import eu.etaxonomy.cdm.model.agent.Person;
20 21 
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
21 22 
import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
22 23 
import eu.etaxonomy.taxeditor.newWizard.NewPersonWizard;
......
73 74 
        public String getText(Object element) {
74 75 
		    T agent = getCdmObjectByUuid(((UuidAndTitleCache<AgentBase>) element).getUuid());
75 76 
			if (agent instanceof INomenclaturalAuthor) {
76 
				return "Nomenclatural title: '" + ((INomenclaturalAuthor) agent).getNomenclaturalTitle() + "'";
77 
				return "Nomenclatural title: '" + ((INomenclaturalAuthor) agent).getNomenclaturalTitleCache() + "'";
77 78 
			} else {
78 79 
				return "'" + agent.getTitleCache() + "' is not a nomenclatural author.";
79 80 
			}
......
120 121 
    @Override
121 122 
    protected void callService(String pattern) {
122 123 
        Class<T> clazz = (Class)AgentBase.class;
124 
        if (selectTeamMember){
125 
            clazz = (Class)Person.class;
126 
        }
127 

  		




  123
  128
  
    
        model = CdmStore.getService(IAgentService.class).getUuidAndTitleCache(clazz, limitOfInitialElements, pattern);


  		




  124
  129
  
    
    }


  		




  125
  130
  
    
}


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorSelectionDialog.java
    
  





  84
  84
  
    
            return "";


  		




  85
  85
  
    
        }


  		




  86
  86
  
    

  		




  87
  
  
    
        return ((INomenclaturalAuthor)cdmObject).getNomenclaturalTitle();


  		




  
  87
  
    
        return ((INomenclaturalAuthor)cdmObject).getNomenclaturalTitleCache();


  		




  88
  88
  
    
    }


  		




  89
  89
  
    

  		




  90
  90
  
    
    public class FilteredCdmResourceAbbrevLabelProvider extends LabelProvider {


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalReferenceSelectionDialog.java
    
  





  33
  33
  
    
			 String title, boolean multi,


  		




  34
  34
  
    
			Reference reference, boolean inReference, TeamOrPersonBase author) {


  		




  35
  35
  
    
		super(shell, //conversation,


  		




  36
  
  
    
		        title, multi, reference);


  		




  
  36
  
    
		        title, multi, reference, null);


  		




  37
  37
  
    
		this.author = author;


  		




  38
  38
  
    
		firstCall = true;


  		




  39
  39
  
    

  		




  ......




  48
  48
  
    
        Control control =getSearchField();


  		




  49
  49
  
    
        lastSelectedReferences = PreferencesUtil.getLastSelectedReferences();


  		




  50
  50
  
    
        if (firstCall && author != null){


  		




  51
  
  
    
            pattern = author.getNomenclaturalTitle();


  		




  
  51
  
    
            pattern = author.getNomenclaturalTitleCache();


  		




  52
  52
  
    
            if (control!= null){


  		




  53
  53
  
    
                firstCall = false;


  		




  54
  54
  
    
                model = CdmStore.getService(IReferenceService.class).getUuidAndAbbrevTitleCacheForAuthor(null, pattern, null);


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/PersonDetailElement.java
    
  





  29
  29
  
    
public class PersonDetailElement extends AbstractIdentifiableEntityDetailElement<Person> {


  		




  30
  30
  
    

  		




  31
  31
  
    
	private TextWithLabelElement text_nomenclaturalTitle;


  		




  
  32
  
    
	private TextWithLabelElement text_collectorTitle;


  		




  32
  33
  
    
	private TextWithLabelElement text_firstname;


  		




  33
  34
  
    
	private TextWithLabelElement text_lastname;


  		




  34
  35
  
    
	private TextWithLabelElement text_prefix;


  		




  ......




  54
  55
  
    
		text_nomenclaturalTitle = formFactory.createTextWithLabelElement(


  		




  55
  56
  
    
				formElement, "Abbrev. Title", entity.getNomenclaturalTitle(),


  		




  56
  57
  
    
				SWT.NULL);


  		




  
  58
  
    
		text_collectorTitle = formFactory.createTextWithLabelElement(


  		




  
  59
  
    
                formElement, "Collector Title", entity.getCollectorTitle(),


  		




  
  60
  
    
                SWT.NULL);


  		




  57
  61
  
    
		text_lastname = formFactory.createTextWithLabelElement(formElement,


  		




  58
  62
  
    
                "Familiy Name", entity.getFamilyName(), SWT.NULL);


  		




  59
  63
  
    
		text_firstname = formFactory.createTextWithLabelElement(formElement,


  		




  ......




  88
  92
  
    
			handleToggleableCacheField();


  		




  89
  93
  
    
		} else if (eventSource == text_nomenclaturalTitle) {


  		




  90
  94
  
    
			getEntity().setNomenclaturalTitle(text_nomenclaturalTitle.getText());


  		




  91
  
  
    
		} else if (eventSource == text_firstname) {


  		




  
  95
  
    
		} else if (eventSource == text_collectorTitle) {


  		




  
  96
  
    
            getEntity().setCollectorTitle(text_collectorTitle.getText());


  		




  
  97
  
    
        }else if (eventSource == text_firstname) {


  		




  92
  98
  
    
			getEntity().setGivenName(text_firstname.getText());


  		




  93
  99
  
    
		}else if (eventSource == text_initials) {


  		




  94
  100
  
    
			getEntity().setInitials(text_initials.getText());


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailElement.java
    
  





  29
  29
  
    
        extends AbstractIdentifiableEntityDetailElement<Team> {


  		




  30
  30
  
    

  		




  31
  31
  
    
	private ToggleableTextElement toggleable_nomenclaturalTitleCache;


  		




  
  32
  
    
	private ToggleableTextElement toggleable_collectorTitleCache;


  		




  32
  33
  
    
	private CheckboxElement hasAdditionalMembers;


  		




  33
  34
  
    

  		




  34
  35
  
    
	private TeamMemberSection section_teamMembers;


  		




  ......




  50
  51
  
    
        toggleable_cache = formFactory.createToggleableTextField(formElement, "Title Cache",


  		




  51
  52
  
    
                entity.getTitleCache(), entity.isProtectedTitleCache(), style);


  		




  52
  53
  
    
        toggleable_nomenclaturalTitleCache = formFactory.createToggleableTextField(formElement,


  		




  53
  
  
    
                "Abbrev. Title", entity.getNomenclaturalTitle(), entity.isProtectedNomenclaturalTitleCache(),


  		




  
  54
  
    
                "Abbrev. Title", entity.getNomenclaturalTitleCache(), entity.isProtectedNomenclaturalTitleCache(),


  		




  
  55
  
    
                CacheRelevance.CACHE2, style);


  		




  
  56
  
    
        toggleable_collectorTitleCache = formFactory.createToggleableTextField(formElement,


  		




  
  57
  
    
                "Collector Title", entity.getCollectorTitleCache(), entity.isProtectedCollectorTitleCache(),


  		




  54
  58
  
    
                CacheRelevance.CACHE2, style);


  		




  55
  59
  
    
        hasAdditionalMembers = formFactory.createCheckbox(formElement, "Additional Members", entity.isHasMoreMembers(), style);


  		




  56
  60
  
    
        section_teamMembers = formFactory.createTeamMemberSection(getConversationHolder(), formElement, StoreUtil.getSectionStyle(TeamMemberSection.class, entity.getClass().getCanonicalName(), true), isNomenclaturalTeam);


  		




  ......




  73
  77
  
    
		    toggleable_nomenclaturalTitleCache.setEnabled(getEntity()


  		




  74
  78
  
    
				.isProtectedNomenclaturalTitleCache());


  		




  75
  79
  
    
		}


  		




  
  80
  
    
		if (toggleable_collectorTitleCache != null){


  		




  
  81
  
    
            toggleable_collectorTitleCache.setEnabled(getEntity()


  		




  
  82
  
    
                .isProtectedCollectorTitleCache());


  		




  
  83
  
    
        }


  		




  76
  84
  
    
		section_teamMembers.setEntity(getEntity());


  		




  77
  85
  
    

  		




  78
  86
  
    
		updateCacheRelevance();


  		




  ......




  86
  94
  
    
		} else if (eventSource == toggleable_nomenclaturalTitleCache) {


  		




  87
  95
  
    
			updateToggleable_nomanclaturalTitleCacheField();


  		




  88
  96
  
    
			updateCacheRelevance();


  		




  89
  
  
    
		} else if (eventSource == section_teamMembers) {


  		




  
  97
  
    
		} else if (eventSource == toggleable_collectorTitleCache) {


  		




  
  98
  
    
            updateToggleable_collectorTitleCacheField();


  		




  
  99
  
    
            updateCacheRelevance();


  		




  
  100
  
    
        } else if (eventSource == section_teamMembers) {


  		




  90
  101
  
    
			toggleable_cache.setText(getEntity().getTitleCache());


  		




  91
  102
  
    
			toggleable_nomenclaturalTitleCache.setText(getEntity()


  		




  92
  
  
    
					.getNomenclaturalTitle());


  		




  
  103
  
    
					.getNomenclaturalTitleCache());


  		




  
  104
  
    
			toggleable_collectorTitleCache.setText(getEntity()


  		




  
  105
  
    
                    .getCollectorTitleCache());


  		




  93
  106
  
    
		} else if (eventSource == hasAdditionalMembers){


  		




  94
  107
  
    
			getEntity().setHasMoreMembers(hasAdditionalMembers.getSelection());


  		




  95
  108
  
    
			updateToggleableCacheField();


  		




  96
  109
  
    
			toggleable_nomenclaturalTitleCache.setText(getEntity()


  		




  97
  
  
    
					.getNomenclaturalTitle());


  		




  
  110
  
    
					.getNomenclaturalTitleCache());


  		




  98
  111
  
    
		}


  		




  99
  112
  
    

  		




  100
  113
  
    
		firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));


  		




  ......




  103
  116
  
    
	public void updateToggleable_nomanclaturalTitleCacheField() {


  		




  104
  117
  
    
		 boolean pushedState = toggleable_nomenclaturalTitleCache.getState();


  		




  105
  118
  
    

  		




  106
  
  
    
	        getEntity().setNomenclaturalTitle(toggleable_nomenclaturalTitleCache.getText(), pushedState);


  		




  
  119
  
    
	        getEntity().setNomenclaturalTitleCache(toggleable_nomenclaturalTitleCache.getText(), pushedState);


  		




  107
  120
  
    
	        updateCacheRelevance();


  		




  108
  121
  
    

  		




  109
  122
  
    
        if (!getEntity().isProtectedNomenclaturalTitleCache()) {


  		




  110
  
  
    
            toggleable_nomenclaturalTitleCache.setText(getEntity().getNomenclaturalTitle());


  		




  
  123
  
    
            toggleable_nomenclaturalTitleCache.setText(getEntity().getNomenclaturalTitleCache());


  		




  111
  124
  
    
        }


  		




  112
  125
  
    
    }


  		




  113
  126
  
    

  		




  
  127
  
    
	public void updateToggleable_collectorTitleCacheField() {


  		




  
  128
  
    
        boolean pushedState = toggleable_collectorTitleCache.getState();


  		




  
  129
  
    

  		




  
  130
  
    
           getEntity().setCollectorTitleCache(toggleable_collectorTitleCache.getText(), pushedState);


  		




  
  131
  
    
           updateCacheRelevance();


  		




  
  132
  
    

  		




  
  133
  
    
       if (!getEntity().isProtectedCollectorTitleCache()) {


  		




  
  134
  
    
           toggleable_collectorTitleCache.setText(getEntity().getCollectorTitleCache());


  		




  
  135
  
    
       }


  		




  
  136
  
    
   }


  		




  
  137
  
    

  		




  114
  138
  
    
    public boolean isNomenclaturalTeam() {


  		




  115
  139
  
    
        return isNomenclaturalTeam;


  		




  116
  140
  
    
    }


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElementWithAbbreviatedTitle.java
    
  





  31
  31
  
    
    protected String getTitle() {


  		




  32
  32
  
    
		if (entity != null){


  		




  33
  33
  
    
		    if(entity instanceof TeamOrPersonBase) {


  		




  34
  
  
    
		        return ((TeamOrPersonBase) entity).getNomenclaturalTitle();


  		




  
  34
  
    
		        return ((TeamOrPersonBase) entity).getNomenclaturalTitleCache();


  		




  35
  35
  
    
		    } else if(entity instanceof Reference){


  		




  36
  36
  
    
		      //FIXME: temporary fix for #6437 to avoid outdated title caches


  		




  37
  37
  
    
		        return ((Reference) entity).generateAbbrevTitle();


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/NomenclaturalAuthorTeamSelectionElement.java
    
  





  62
  62
  
    
	/** {@inheritDoc} */


  		




  63
  63
  
    
	@Override


  		




  64
  64
  
    
	protected String getTitle() {


  		




  65
  
  
    
		return (entity != null) ? entity.getNomenclaturalTitle() : "";


  		




  
  65
  
    
		return (entity != null) ? entity.getNomenclaturalTitleCache() : "";


  		




  66
  66
  
    
	}


  		




  67
  67
  
    

  		




  68
  68
  
    
	/** {@inheritDoc} */


  		












Also available in:  Unified diff