Project

General

Profile

« Previous | Next » 

Revision 77360286

Added by Katja Luther almost 3 years ago

ref #9680: adapt edtior to cdmlib changes in agent searches

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/NomenclaturalAuthorSelectionDialog.java
12 12
import java.util.Comparator;
13 13
import java.util.List;
14 14

  
15
import org.eclipse.jface.viewers.ILabelProvider;
16
import org.eclipse.jface.viewers.LabelProvider;
17 15
import org.eclipse.swt.widgets.Shell;
18 16

  
19 17
import eu.etaxonomy.cdm.api.service.IAgentService;
20 18
import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;
21 19
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
22
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
23 20
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
24 21
import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
25 22
import eu.etaxonomy.taxeditor.newWizard.NewPersonWizard;
26 23
import eu.etaxonomy.taxeditor.newWizard.NewTeamWizard;
27
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
28 24
import eu.etaxonomy.taxeditor.store.CdmStore;
29 25

  
30 26
/**
......
58 54
        }
59 55
    }
60 56

  
61
    @Override
62
	protected ILabelProvider createListLabelProvider() {
63
		return new FilteredCdmResourceAbbrevLabelProvider();
64
	}
57
//    @Override
58
//	protected ILabelProvider createListLabelProvider() {
59
//		return new FilteredCdmResourceAbbrevLabelProvider();
60
//	}
65 61

  
66 62
    /**
67 63
     * <p>select</p>
......
87 83
        return ((INomenclaturalAuthor)cdmObject).getNomenclaturalTitleCache();
88 84
    }
89 85

  
90
    public class FilteredCdmResourceAbbrevLabelProvider extends LabelProvider {
91
		@Override
92
		public String getText(Object element) {
93
			if (element == null) {
94
				return null;
95
			}
96
			UuidAndTitleCache<?> uuidAndTitleCache = (UuidAndTitleCache<?>) element;
97
			String titleCache = uuidAndTitleCache.getTitleCache();
98
			String abbrevTitleCache = uuidAndTitleCache.getAbbrevTitleCache();
99
			if(titleCache!=null && abbrevTitleCache!=null){
100
			    if (!titleCache.equals(abbrevTitleCache)){
101
			        abbrevTitleCache += " - " + titleCache;
102
			    }
103
			    if(PreferencesUtil.getBooleanValue(PreferencePredicate.ShowIdInSelectionDialog.getKey())){
104
			        abbrevTitleCache += " ["+uuidAndTitleCache.getId()+"]";
105
			    }
106
			}
107
            return abbrevTitleCache!=null?abbrevTitleCache:"[title null]";
108
		}
109
	}
86
//    public class FilteredCdmResourceAbbrevLabelProvider extends LabelProvider {
87
//		@Override
88
//		public String getText(Object element) {
89
//			if (element == null) {
90
//				return null;
91
//			}
92
//			UuidAndTitleCache<?> uuidAndTitleCache = (UuidAndTitleCache<?>) element;
93
//			String titleCache = uuidAndTitleCache.getTitleCache();
94
//			String abbrevTitleCache = uuidAndTitleCache.getAbbrevTitleCache();
95
//			if(titleCache!=null && abbrevTitleCache!=null){
96
//			    if (!titleCache.equals(abbrevTitleCache)){
97
//			        abbrevTitleCache += " - " + titleCache;
98
//			    }
99
//			    if(PreferencesUtil.getBooleanValue(PreferencePredicate.ShowIdInSelectionDialog.getKey())){
100
//			        abbrevTitleCache += " ["+uuidAndTitleCache.getId()+"]";
101
//			    }
102
//			}
103
//            return abbrevTitleCache!=null?abbrevTitleCache:"[title null]";
104
//		}
105
//	}
110 106

  
111 107
	@Override
112 108
	protected Comparator<UuidAndTitleCache<TeamOrPersonBase<?>>> getItemsComparator() {

Also available in: Unified diff