Project

General

Profile

Revision 53a122e4

ID53a122e48e7f0fe69c6283f7f1a3edbf4699e6f3
Parent 22738258
Child d7023fd8

Added by Andreas Müller over 3 years ago

fix #6120 Cleanup uuidAndTitleCache methods

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
861 861
		return null;
862 862
	}
863 863

  
864
	@Override
865
	public <S extends AgentBase> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
866
			Class<S> arg0, Integer arg1, String arg2) {
867
		// TODO Auto-generated method stub
868
		return null;
869
	}
870

  
864 871

  
865 872
}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
1070 1070
		return null;
1071 1071
	}
1072 1072

  
1073
	@Override
1074
	public <S extends Classification> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
1075
			Class<S> arg0, Integer arg1, String arg2) {
1076
		// TODO Auto-generated method stub
1077
		return null;
1078
	}
1079

  
1073 1080
   
1074 1081

  
1075 1082

  
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
768 768
		return null;
769 769
	}
770 770

  
771
	@Override
772
	public <S extends Collection> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
773
			Class<S> arg0, Integer arg1, String arg2) {
774
		// TODO Auto-generated method stub
775
		return null;
776
	}
777

  
771 778

  
772 779

  
773 780
}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
1253 1253
		return null;
1254 1254
	}
1255 1255

  
1256
	@Override
1257
	public <S extends DescriptionBase> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
1258
			Class<S> arg0, Integer arg1, String arg2) {
1259
		// TODO Auto-generated method stub
1260
		return null;
1261
	}
1262

  
1256 1263

  
1257 1264
}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
1243 1243
		// TODO Auto-generated method stub
1244 1244
		return null;
1245 1245
	}
1246

  
1247
	@Override
1248
	public <S extends TaxonNameBase> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
1249
			Class<S> arg0, Integer arg1, String arg2) {
1250
		// TODO Auto-generated method stub
1251
		return null;
1252
	}
1246 1253
	
1247 1254

  
1248 1255
}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
1119 1119
		return null;
1120 1120
	}
1121 1121

  
1122
	@Override
1123
	public <S extends SpecimenOrObservationBase> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
1124
			Class<S> arg0, Integer arg1, String arg2) {
1125
		// TODO Auto-generated method stub
1126
		return null;
1127
	}
1128

  
1122 1129
}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
787 787
		return null;
788 788
	}
789 789

  
790
	@Override
791
	public <S extends Reference> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
792
			Class<S> arg0, Integer arg1, String arg2) {
793
		// TODO Auto-generated method stub
794
		return null;
795
	}
796

  
790 797
}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
1485 1485
		return defaultService.getUuidAndTitleCache(limit, pattern);
1486 1486
	}
1487 1487

  
1488
	@Override
1489
	public List<UuidAndTitleCache<TaxonBase>> getUuidAndTitleCacheTaxon(
1490
			Integer limit, String pattern) {
1491
		return defaultService.getUuidAndTitleCacheTaxon(limit, pattern);
1492
	}
1493

  
1494
	@Override
1495
	public List<UuidAndTitleCache<TaxonBase>> getUuidAndTitleCacheSynonym(
1496
			Integer limit, String pattern) {
1497
		return defaultService.getUuidAndTitleCacheSynonym(limit, pattern);
1498
	}
1499 1488

  
1500 1489
	@Override
1501 1490
	public List<TaxonBase> loadByIds(List<Integer> idSet, List<String> propertyPaths) {
......
1518 1507
		return null;
1519 1508
	}
1520 1509

  
1510
	@Override
1511
	public <S extends TaxonBase> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
1512
			Class<S> arg0, Integer arg1, String arg2) {
1513
		// TODO Auto-generated method stub
1514
		return null;
1515
	}
1516

  
1521 1517

  
1522 1518
}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
933 933
		// TODO Auto-generated method stub
934 934
		return null;
935 935
	}
936

  
937
	@Override
938
	public <S extends DefinedTermBase> List<UuidAndTitleCache<S>> getUuidAndTitleCache(
939
			Class<S> arg0, Integer arg1, String arg2) {
940
		// TODO Auto-generated method stub
941
		return null;
942
	}
936 943
}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonBaseSelectionDialog.java
10 10

  
11 11
package eu.etaxonomy.taxeditor.ui.dialog.selection;
12 12

  
13
import java.util.List;
13 14
import java.util.UUID;
14 15

  
15 16
import org.eclipse.swt.widgets.Control;
......
21 22
import eu.etaxonomy.cdm.model.taxon.Synonym;
22 23
import eu.etaxonomy.cdm.model.taxon.Taxon;
23 24
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
25
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
24 26
import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
25 27
import eu.etaxonomy.taxeditor.newWizard.NewTaxonWizard;
26 28
import eu.etaxonomy.taxeditor.store.CdmStore;
......
69 71
    }
70 72

  
71 73
    /** {@inheritDoc} */
72
    @Override
74
    @SuppressWarnings({ "unchecked", "rawtypes" })
75
	@Override
73 76
    protected void initModel() {
74 77
        Control control = getPatternControl();
75 78
        String pattern = null;
......
79 82

  
80 83

  
81 84

  
82
        if(clazz == TaxonBase.class){
83
            model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCache(limitOfInitialElements, pattern);
84
        }
85
        else if(clazz == Taxon.class){
86
            model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCacheTaxon(limitOfInitialElements, pattern);
87
        }
88
        else if(clazz == Synonym.class){
89
            model = CdmStore.getService(ITaxonService.class).getUuidAndTitleCacheSynonym(limitOfInitialElements, pattern);
90
        }
85
        model = (List)CdmStore.getService(ITaxonService.class).getUuidAndTitleCache(Taxon.class, limitOfInitialElements, pattern);
91 86
    }
92 87

  
93 88
    /** {@inheritDoc} */

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)