Project

General

Profile

« Previous | Next » 

Revision 124424d0

Added by Cherian Mathew almost 11 years ago

updates for 3.3 model changes. Phase two commit, which contains method changes / updates

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
190 190 
		ITreeNode parentNode = CdmStore.getService(IClassificationService.class).getTreeNodeByUuid(parentNodeUuid);
191 191
192 192 
		Taxon newTaxon = Taxon.NewInstance(name, parentNode.getReference());
193 
		TaxonNode newTaxonNode = parentNode.addChildTaxon(newTaxon, parentNode.getReference(), parentNode.getMicroReference(), null);
193 
		TaxonNode newTaxonNode = parentNode.addChildTaxon(newTaxon, parentNode.getReference(), parentNode.getMicroReference());
194 194
195 195 
		// add the new taxon to the editors persistence context
196 196 
		UUID newTaxonNodeUuid = CdmStore.getService(ITaxonNodeService.class).save(newTaxonNode);
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java
84 84 
		monitor.worked(20);
85 85
86 86 
		synonym.setSec(null);
87 
		newNode = parentNode.addChildTaxon(newTaxon, null, null, null);
87 
		newNode = parentNode.addChildTaxon(newTaxon, null, null);
88 88
89 89 
		if(synonymsInHomotypicalGroup != null){
90 90 
			Taxon taxon = newNode.getTaxon();
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java
49 49 
			}
50 50 
		}
51 51 
		else if (element instanceof CategoricalData) {
52 
			if (!((CategoricalData) element).getStates().isEmpty()) {
52 
			if (!((CategoricalData) element).getStateData().isEmpty()) {
53 53 
				boolean isUseCategoryAbsent = true;
54 
				for (StateData statedata : ((CategoricalData) element).getStates()) {
54 
				for (StateData statedata : ((CategoricalData) element).getStateData()) {
55 55 
					if(statedata.getState() != null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) !=null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useCategoryVocabularyLabel)) {
56 56 
						text = text + statedata.getState().getTitleCache() + ";";
57 57 
						isUseCategoryAbsent = false;
......
62 62 
				}
63 63
64 64 
				boolean isUseSubCategoryAbsent = true;
65 
				for (StateData statedata : ((CategoricalData) element).getStates()) {
65 
				for (StateData statedata : ((CategoricalData) element).getStateData()) {
66 66 
					if(statedata.getState() != null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) !=null && statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useSubCategoryVocabularyLabel)) {
67 67 
						text = text + statedata.getState().getTitleCache() + ";";
68 68 
						isUseSubCategoryAbsent = false;
eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/MoveTaxonOperationTest.java
49 49 
		newParentTaxon = Taxon.NewInstance(null, null);
50 50
51 51 
		tree = Classification.NewInstance(null);
52 
		oldParentTaxonNode = tree.addChildTaxon(oldParentTaxon, null, null, null);
53 
		newParentTaxonNode = tree.addChildTaxon(newParentTaxon, null, null, null);
52 
		oldParentTaxonNode = tree.addChildTaxon(oldParentTaxon, null, null);
53 
		newParentTaxonNode = tree.addChildTaxon(newParentTaxon, null, null);
54 54
55 
		taxonNode = oldParentTaxonNode.addChildTaxon(taxon, null, null, null);
55 
		taxonNode = oldParentTaxonNode.addChildTaxon(taxon, null, null);
56 56
57 57 
		operation = null;//new MoveTaxonOperation("Move Taxon To Different Parent", undoContext, taxonNode, newParentTaxonNode, postOperation);
58 58 
	}
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
86 86 
		try {
87 87 
			for (TaxonNode taxonNode : taxonNodes){
88 88 
				TaxonNode newTaxonNode = newParentTreeNode.addChildNode(taxonNode,
89 
						newParentTreeNode.getReference(), newParentTreeNode.getMicroReference(),
90 
						taxonNode.getSynonymToBeUsed());
89 
						newParentTreeNode.getReference(), newParentTreeNode.getMicroReference());
91 90 
				taxonNodes.add(newTaxonNode);
92 91 
				monitor.worked(2);
93 92 
			}
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java
92 92 
			// add the taxon
93 93 
			bind();
94 94 
			monitor.worked(20);
95 
			childTaxonNode = parentNode.addChildTaxon(newTaxon, parentNode.getReference(), parentNode.getMicroReference(), null);
95 
			childTaxonNode = parentNode.addChildTaxon(newTaxon, parentNode.getReference(), parentNode.getMicroReference());
96 96
97 97 
			monitor.worked(40);
98 98 

  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/NamedAreaEditorInput.java
    
  





  14
  14
  
    

  		




  15
  15
  
    
import eu.etaxonomy.cdm.model.location.Continent;


  		




  16
  16
  
    
import eu.etaxonomy.cdm.model.location.NamedArea;


  		




  17
  
  
    
import eu.etaxonomy.cdm.model.location.TdwgArea;


  		




  18
  17
  
    
import eu.etaxonomy.cdm.model.location.WaterbodyOrCountry;


  		




  19
  18
  
    

  		




  20
  19
  
    
/**


  		




  ......




  25
  24
  
    
public class NamedAreaEditorInput extends AbstractDefinedTermEditorInput<NamedArea> {


  		




  26
  25
  
    

  		




  27
  26
  
    
	private List<String> termClasses = Arrays.asList(new String[]{


  		




  28
  
  
    
			NamedArea.class.getName(), 


  		




  29
  
  
    
			TdwgArea.class.getName(),


  		




  
  27
  
    
			NamedArea.class.getName(), 			


  		




  30
  28
  
    
			WaterbodyOrCountry.class.getName(),


  		




  31
  29
  
    
			Continent.class.getName()


  		




  32
  30
  
    
	});


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
    
  





  45
  45
  
    
			ITreeNode parent = getParentTreeNode();


  		




  46
  46
  
    
			Taxon taxon = taxonNodePage.getTaxon();


  		




  47
  47
  
    
			try{


  		




  48
  
  
    
				TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference(), null);


  		




  
  48
  
    
				TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference());


  		




  49
  49
  
    
				generatedTaxonNodeUuid = CdmStore.getService(ITaxonNodeService.class).saveOrUpdate(taxonNode);


  		




  50
  50
  
    
			}catch(IllegalArgumentException e){


  		




  51
  51
  
    
				StoreUtil.warningDialog("Taxon already exists in classfication", getClass(), e.getMessage());


  		












  

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





  80
  80
  
    
	/** {@inheritDoc} */


  		




  81
  81
  
    
	@Override


  		




  82
  82
  
    
	protected void initModel() {


  		




  83
  
  
    
		model = CdmStore.getService(IOccurrenceService.class).getDerivedUnitBaseUuidAndTitleCache();


  		




  
  83
  
    
		model = CdmStore.getService(IOccurrenceService.class).getDerivedUnitUuidAndTitleCache();


  		




  84
  84
  
    
	}


  		




  85
  85
  
    

  		




  86
  86
  
    
	/** {@inheritDoc} */


  		












  

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





  87
  87
  
    
	/** {@inheritDoc} */


  		




  88
  88
  
    
	@Override


  		




  89
  89
  
    
	protected void initModel() {


  		




  90
  
  
    
		model = CdmStore.getService(IOccurrenceService.class).getFieldObservationUuidAndTitleCache();


  		




  
  90
  
    
		model = CdmStore.getService(IOccurrenceService.class).getFieldUnitUuidAndTitleCache();


  		




  91
  91
  
    
	}


  		




  92
  92
  
    

  		




  93
  93
  
    
	/** {@inheritDoc} */


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescribedSpecimenSection.java
    
  





  48
  48
  
    
	@Override


  		




  49
  49
  
    
	public Collection<SpecimenOrObservationBase> getCollection(


  		




  50
  50
  
    
			TaxonDescription entity) {


  		




  51
  
  
    
		return entity.getDescribedSpecimenOrObservations();


  		




  
  51
  
    
		//FIXME:3.3MC


  		




  
  52
  
    
		return entity.getDescribedSpecimenOrObservation();


  		




  52
  53
  
    
	}


  		




  53
  54
  
    

  		




  54
  55
  
    
	/** {@inheritDoc} */


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StateDataSection.java
    
  





  45
  45
  
    
	/** {@inheritDoc} */


  		




  46
  46
  
    
	@Override


  		




  47
  47
  
    
	public Collection<StateData> getCollection(CategoricalData entity) {


  		




  48
  
  
    
		return entity.getStates();


  		




  
  48
  
    
		return entity.getStateData();


  		




  49
  49
  
    
	}


  		




  50
  50
  
    

  		




  51
  51
  
    
	/** {@inheritDoc} */


  		




  ......




  57
  57
  
    
	/** {@inheritDoc} */


  		




  58
  58
  
    
	@Override


  		




  59
  59
  
    
	public void addElement(StateData element) {


  		




  60
  
  
    
		getEntity().addState(element);


  		




  
  60
  
    
		getEntity().addStateData(element);


  		




  61
  61
  
    
	}


  		




  62
  62
  
    

  		




  63
  63
  
    
	/** {@inheritDoc} */


  		




  64
  64
  
    
	@Override


  		




  65
  65
  
    
	public void removeElement(StateData element) {


  		




  66
  
  
    
		getEntity().removeState(element);


  		




  
  66
  
    
		getEntity().removeStateData(element);


  		




  67
  67
  
    
	}


  		




  68
  68
  
    

  		




  69
  69
  
    
	/** {@inheritDoc} */


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
    
  





  89
  89
  
    
		text_collectingMethod = formFactory.createTextWithLabelElement(


  		




  90
  90
  
    
				formElement, "Collecting Method", entity.getCollectingMethod(),


  		




  91
  91
  
    
				style);


  		




  92
  
  
    

  		




  
  92
  
    
		//FIXME:3.3MC


  		




  93
  93
  
    
		number_distanceToGround = formFactory


  		




  94
  94
  
    
				.createIntegerTextWithLabelElement(formElement,


  		




  95
  95
  
    
						"Distance To Ground (m)", entity.getDistanceToGround(),


  		












  

    
      eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
    
  





  137
  137
  
    
	 * @return


  		




  138
  138
  
    
	 */


  		




  139
  139
  
    
	private State stateSelection(String comboCategory) {


  		




  140
  
  
    
		if (!getEntity().getStates().isEmpty()) {


  		




  141
  
  
    
			for (StateData statedata : getEntity().getStates()) {


  		




  
  140
  
    
		if (!getEntity().getStateData().isEmpty()) {


  		




  
  141
  
    
			for (StateData statedata : getEntity().getStateData()) {


  		




  142
  142
  
    
				if (statedata.getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {


  		




  143
  143
  
    
					String testString = statedata.getModifyingText().get(CdmStore.getDefaultLanguage()).getText();


  		




  144
  144
  
    
					if(testString.equals(comboCategory)) {


  		




  ......




  219
  219
  
    
	


  		




  220
  220
  
    
			}


  		




  221
  221
  
    
		}


  		




  222
  
  
    
		else if (!getEntity().getStates().isEmpty()) {


  		




  223
  
  
    
			for (StateData stateData : getEntity().getStates()) {


  		




  
  222
  
    
		else if (!getEntity().getStateData().isEmpty()) {


  		




  
  223
  
    
			for (StateData stateData : getEntity().getStateData()) {


  		




  224
  224
  
    
				if (stateData.getModifyingText().get(CdmStore.getDefaultLanguage()) != null) {


  		




  225
  225
  
    
					if ((stateData.getState() != null) && (stateData.getModifyingText().get(CdmStore.getDefaultLanguage()).getText() == UsageTermCollection.useCategoryVocabularyLabel)) {


  		




  226
  226
  
    
						for (State term : listOfTerms) {


  		




  ......




  297
  297
  
    
			if (combo_UseCategory.getSelection() != null) {


  		




  298
  298
  
    
				boolean isChanged = false;


  		




  299
  299
  
    
				boolean isUseCategoryChanged = false;


  		




  300
  
  
    
				if (!getEntity().getStates().isEmpty()) {


  		




  301
  
  
    
					for (StateData useCategoryStateDataCheck : getEntity().getStates()) {


  		




  
  300
  
    
				if (!getEntity().getStateData().isEmpty()) {


  		




  
  301
  
    
					for (StateData useCategoryStateDataCheck : getEntity().getStateData()) {


  		




  302
  302
  
    
						Map<Language, LanguageString> modText = useCategoryStateDataCheck.getModifyingText();


  		




  303
  303
  
    
						if(modText.get(CdmStore.getDefaultLanguage()) != null && modText.get(CdmStore.getDefaultLanguage()).getText().equals(UsageTermCollection.useCategoryVocabularyLabel)) {


  		




  304
  304
  
    
							if(!useCategoryStateDataCheck.getState().getTitleCache().equals(combo_UseCategory.getSelection().getTitleCache())) {


  		




  ......




  307
  307
  
    
							


  		




  308
  308
  
    
						}


  		




  309
  309
  
    
					}


  		




  310
  
  
    
					ListIterator<StateData> itrExistingStates = getEntity().getStates().listIterator();


  		




  
  310
  
    
					ListIterator<StateData> itrExistingStates = getEntity().getStateData().listIterator();


  		




  311
  311
  
    
					while(itrExistingStates.hasNext()) {


  		




  312
  312
  
    
						StateData existingStateData = itrExistingStates.next();


  		




  313
  313
  
    
						Map<Language, LanguageString> modifyingText = existingStateData


  		




  ......




  336
  336
  
    
							.NewInstance(combo_UseCategory.getSelection());


  		




  337
  337
  
    
					stateData.setState(combo_UseCategory.getSelection());


  		




  338
  338
  
    
					stateData.putModifyingText(CdmStore.getDefaultLanguage(), UsageTermCollection.useCategoryVocabularyLabel);


  		




  339
  
  
    
					getEntity().addState(stateData);


  		




  
  339
  
    
					getEntity().addStateData(stateData);


  		




  340
  340
  
    
				}


  		




  341
  341
  
    
				


  		




  342
  342
  
    
				combo_UseSubCategory.setEnabled(true);


  		




  343
  343
  
    
	


  		




  344
  344
  
    
			}


  		




  345
  345
  
    
			else {


  		




  346
  
  
    
				if (!getEntity().getStates().isEmpty()) {


  		




  347
  
  
    
					Iterator<StateData> itr = getEntity().getStates().iterator();


  		




  
  346
  
    
				if (!getEntity().getStateData().isEmpty()) {


  		




  
  347
  
    
					Iterator<StateData> itr = getEntity().getStateData().iterator();


  		




  348
  348
  
    
					while(itr.hasNext()) {


  		




  349
  349
  
    
						StateData stateToRemove = itr.next();


  		




  350
  350
  
    
						itr.remove();


  		




  ......




  361
  361
  
    
		if (eventSource == combo_UseSubCategory) {


  		




  362
  362
  
    
			if (combo_UseSubCategory.getSelection() != null) {


  		




  363
  363
  
    
				boolean isChanged = false;


  		




  364
  
  
    
				if (!getEntity().getStates().isEmpty()) {


  		




  365
  
  
    
					ListIterator<StateData> itrExistingStates = getEntity().getStates().listIterator();


  		




  
  364
  
    
				if (!getEntity().getStateData().isEmpty()) {


  		




  
  365
  
    
					ListIterator<StateData> itrExistingStates = getEntity().getStateData().listIterator();


  		




  366
  366
  
    
					while(itrExistingStates.hasNext()) {


  		




  367
  367
  
    
						StateData existingStateData = itrExistingStates.next();


  		




  368
  368
  
    
						Map<Language, LanguageString> modifyingText = existingStateData


  		




  ......




  387
  387
  
    
							.NewInstance(combo_UseSubCategory.getSelection());


  		




  388
  388
  
    
					stateData.setState(combo_UseSubCategory.getSelection());


  		




  389
  389
  
    
					stateData.putModifyingText(CdmStore.getDefaultLanguage(), UsageTermCollection.useSubCategoryVocabularyLabel);


  		




  390
  
  
    
					getEntity().addState(stateData);


  		




  
  390
  
    
					getEntity().addStateData(stateData);


  		




  391
  391
  
    
				}


  		




  392
  392
  
    
	


  		




  393
  393
  
    
			} else {


  		




  394
  
  
    
				if (!getEntity().getStates().isEmpty()) {


  		




  395
  
  
    
					Iterator<StateData> itrStateData = getEntity().getStates().iterator();


  		




  
  394
  
    
				if (!getEntity().getStateData().isEmpty()) {


  		




  
  395
  
    
					Iterator<StateData> itrStateData = getEntity().getStateData().iterator();


  		




  396
  396
  
    
					while(itrStateData.hasNext()) {


  		




  397
  397
  
    
						StateData existingStateData = itrStateData.next();


  		




  398
  398
  
    
						Map<Language, LanguageString> modifyingText = existingStateData


  		




  ......




  568
  568
  
    
				if (selectedUseCategory != null) {


  		




  569
  569
  
    
					combo_UseSubCategory.setTerms(setUseCategoryComboTerms(TermStore.getTerms(State.class, null, false),selectedUseCategory));


  		




  570
  570
  
    
				


  		




  571
  
  
    
					if (!getEntity().getStates().isEmpty()) {


  		




  572
  
  
    
						Iterator<StateData> itrExistingState = getEntity().getStates().iterator();


  		




  
  571
  
    
					if (!getEntity().getStateData().isEmpty()) {


  		




  
  572
  
    
						Iterator<StateData> itrExistingState = getEntity().getStateData().iterator();


  		




  573
  573
  
    
						while(itrExistingState.hasNext()) {


  		




  574
  574
  
    
							StateData existingStateData = (StateData) itrExistingState.next();


  		




  575
  575
  
    
							Map<Language, LanguageString> modifyingText = existingStateData.getModifyingText();


  		












Also available in:  Unified diff