Project

General

Profile

Revision 8848da42

ID8848da42c2ce6bc6caf414563b383787096e8986
Parent cac97126
Child 024216db

Added by Andreas Müller over 3 years ago

cleanup

View differences:

cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
421 421
            @PathVariable("uuid") UUID uuid,
422 422
            HttpServletRequest request,
423 423
            HttpServletResponse response) throws IOException {
424

  
424 425
        logger.info("doGetTaxonNodes" + requestPathAndQuery(request));
425 426
        TaxonBase<?> taxon = service.load(uuid, NO_UNPUBLISHED, TAXONNODE_INIT_STRATEGY);
426 427
        if(taxon instanceof Taxon){
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/MatchModePropertyEditor.java
1 1
/**
2 2
 * Copyright (C) 2009 EDIT
3
 * European Distributed Institute of Taxonomy 
3
 * European Distributed Institute of Taxonomy
4 4
 * http://www.e-taxonomy.eu
5
 * 
5
 *
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
 */
......
14 14
import eu.etaxonomy.cdm.persistence.query.MatchMode;
15 15

  
16 16
public class MatchModePropertyEditor extends PropertyEditorSupport {
17
	
18
	public void setAsText(String name) {
19
		
20
		setValue(MatchMode.valueOf(name == null ? null : name.toUpperCase()));		
17

  
18
	@Override
19
    public void setAsText(String name) {
20
		setValue(MatchMode.valueOf(name == null ? null : name.toUpperCase()));
21 21
	}
22 22

  
23 23
}
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/TermBaseListPropertyEditor.java
47 47
            try{
48 48
                UUID.fromString(tokens[0]);
49 49
                // no exception! treat all tokens as UUID
50
                Set<UUID> uuids = new HashSet<UUID>(tokens.length);
50
                Set<UUID> uuids = new HashSet<>(tokens.length);
51 51
                for(String token : tokens){
52 52
                    uuids.add(UUID.fromString(token));
53 53
                }
......
58 58
                    // no exception! treat all tokens as ID
59 59

  
60 60
                } catch (IllegalArgumentException e2){
61
                    Set<Integer> ids = new HashSet<Integer>(tokens.length);
61
                    Set<Integer> ids = new HashSet<>(tokens.length);
62 62
                    for(String token : tokens){
63 63
                        ids.add(Integer.parseInt(token));
64 64
                    }
cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/UUIDListPropertyEditor.java
12 12

  
13 13
public class UUIDListPropertyEditor extends PropertyEditorSupport {
14 14

  
15
    @Override
15 16
    public void setAsText(String text) {
16 17
        String separator = ",";
17
        List<UUID> uuidList = new ArrayList<UUID>();
18
        List<UUID> uuidList = new ArrayList<>();
18 19
        if (text.contains(",")){
19 20
            //set the value for more than one UUID
20 21
            String[] uuidStringList = text.split(separator);

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)