Project

General

Profile

« Previous | Next » 

Revision 32ae53fa

Added by Andreas Müller over 2 years ago

cleanup

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/ITaxonTreeNode.java
6 6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
* See LICENSE.TXT at the top of this package for the full license terms.
8 8
*/
9

  
10 9
package eu.etaxonomy.cdm.model.taxon;
11 10

  
12 11
import java.util.List;
......
16 15
import eu.etaxonomy.cdm.model.reference.NamedSource;
17 16
import eu.etaxonomy.cdm.model.reference.Reference;
18 17

  
19

  
20 18
/**
21 19
 * @author n.hoffmann
22 20
 * @since Sep 18, 2009
......
25 23

  
26 24
	/**
27 25
	 * Adds a taxon node as a child of the ITreeNode at the last position.
28
	 *
29
	 * @param childNode
30
	 * @param citation
31
	 * @param microCitation
32
	 * @param synonymToBeUsed
33
	 * @return the child node
34 26
	 */
35 27
	public TaxonNode addChildNode(TaxonNode childNode, Reference citation, String microCitation);
36 28

  
37 29
	/**
38 30
	 * Adds a taxon node as a child of this {@link ITreeNode} at the index position.
39
	 * @param childNode
40
	 * @param index
41
	 * @param citation
42
	 * @param microCitation
43
	 * @return
44 31
	 */
45 32
	public TaxonNode addChildNode(TaxonNode childNode, int index, Reference citation, String microCitation);
46 33

  
47 34

  
48 35
	/**
49 36
	 * Adds a taxon as a child of the ITreeNode at the last position.
50
	 *
51
	 * @param taxon
52
	 * @param citation
53
	 * @param microCitation
54
	 * @return the child node
55 37
	 */
56 38
	public TaxonNode addChildTaxon(Taxon taxon, Reference citation, String microCitation);
57 39

  
58 40

  
59 41
	/**
60 42
	 * Adds a taxon as a child of the ITreeNode at the index position.
61
	 *
62
	 * @param taxon
63
	 * @param citation
64
	 * @param microCitation
65
	 * @return the child node
66 43
	 */
67 44
	public TaxonNode addChildTaxon(Taxon taxon, int index, Reference citation, String microCitation);
68 45

  
......
101 78
	 */
102 79
 	public abstract String getMicroReference();
103 80

  
104
    /**
105
     * @param taxon
106
     * @param source
107
     * @param microCitation
108
     * @return
109
     */
110
    TaxonNode addChildTaxon(Taxon taxon, NamedSource source);
111

  
112
    /**
113
     * @param taxon
114
     * @param index
115
     * @param source
116
     * @return
117
     */
118
    TaxonNode addChildTaxon(Taxon taxon, int index, NamedSource source);
119

  
120
    /**
121
     * @param child
122
     * @param index
123
     * @param source
124
     * @param microReference
125
     * @return
126
     */
127
    TaxonNode addChildNode(TaxonNode child, int index, NamedSource source);
81
    public TaxonNode addChildTaxon(Taxon taxon, NamedSource source);
82

  
83

  
84
    public TaxonNode addChildTaxon(Taxon taxon, int index, NamedSource source);
85

  
86
    public TaxonNode addChildNode(TaxonNode child, int index, NamedSource source);
128 87

  
129 88
}
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
150 150
    //see https://dev.e-taxonomy.eu/redmine/issues/4200
151 151
    private Integer sortIndex = -1;
152 152

  
153
//    //the source for this placement
154
//    @XmlElement(name = "source")
155
//    @XmlIDREF
156
//    @XmlSchemaType(name = "IDREF")
157
//    @OneToOne(fetch = FetchType.LAZY, orphanRemoval=true)
158
//    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE, CascadeType.DELETE, CascadeType.PERSIST})
159
//    private DescriptionElementSource source;
160

  
161 153
    @XmlElement(name = "countChildren")
162 154
    private int countChildren;
163 155

  
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBase.java
707 707
    protected <E extends IAnnotatableEntity> List<UuidAndTitleCache<E>> getUuidAndAbbrevTitleCache(Query query){
708 708
        List<UuidAndTitleCache<E>> list = new ArrayList<>();
709 709

  
710
		List<Object[]> result = query.list();
710
		@SuppressWarnings("unchecked")
711
        List<Object[]> result = query.list();
711 712

  
712 713
        for(Object[] object : result){
713 714
            list.add(new UuidAndTitleCache<E>((UUID) object[0],(Integer) object[1], (String) object[3], (String) object[2]));

Also available in: Unified diff