Project

General

Profile

« Previous | Next » 

Revision 5fd24c47

Added by Katja Luther almost 7 years ago

missed to commit changes in Root class

View differences:

eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/Root.java
9 9

  
10 10
package eu.etaxonomy.taxeditor.navigation.navigator;
11 11

  
12
import java.util.ArrayList;
12 13
import java.util.Arrays;
13 14
import java.util.List;
14 15

  
......
21 22
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
22 23
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
23 24
import eu.etaxonomy.cdm.api.service.IClassificationService;
25
import eu.etaxonomy.cdm.model.common.ITreeNode;
24 26
import eu.etaxonomy.cdm.model.taxon.Classification;
25 27
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
26 28
import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
......
54 56
	 *
55 57
	 * @return a {@link java.util.List} object.
56 58
	 */
57
	public List<Classification> getParentBeans() {
59
	public List<ITreeNode> getParentBeans() {
58 60
		List<String> propertyPaths = Arrays.asList(new String[]{
59 61
		        "name", //$NON-NLS-1$
60 62
		        "rootNode.childNodes"}); //$NON-NLS-1$
61 63

  
62 64
		List<Classification> classifications = CdmStore.getService(IClassificationService.class).list(null, null, null, null, propertyPaths);
63

  
65
		List<ITreeNode> rootNodes = new ArrayList<>();
66
		
64 67
		if(classifications.size() == 0){
65 68
			Classification classification = Classification.NewInstance(Messages.Root_MY_CLASSIFICATION);
66 69
			AbstractPostOperation operation = new CreateClassification(Messages.Root_CREATE_CLASSIFICATION, NavigationUtil.getUndoContext(), classification, NavigationUtil.getNavigator(false), NavigationUtil.getNavigator(false), NavigationUtil.getNavigator(false));
......
68 71

  
69 72
			classifications = CdmStore.getService(IClassificationService.class).list(null, null, null, null, propertyPaths);
70 73
		}
71

  
72
		return classifications;
74
		for (Classification classification: classifications){
75
			rootNodes.add(classification.getRootNode());
76
		}
77
		return rootNodes;
73 78
	}
74 79

  
75 80
	/* (non-Javadoc)

Also available in: Unified diff